diff -uNr a/mp-wp/.htaccess b/mp-wp/.htaccess
--- a/mp-wp/.htaccess false
+++ b/mp-wp/.htaccess 23164212887a9fa35d330f33bce2c3b96604e7331b79f2a0de7f8b845556cc06bc5fbee0b01b16e026461aa92302f92d971fbd39ec267528a65c421684226688
@@ -0,0 +1,26 @@
+ErrorDocument 404 /
+ErrorDocument 403 /
+ErrorDocument 401 /
+
+# Expire images header
+ExpiresActive On
+ExpiresDefault A0
+ExpiresByType text/css A2592000
+
+<FilesMatch "wp-login.php">
+Order deny,allow
+Deny from all
+Allow from 
+</FilesMatch>
+
+
+# BEGIN WordPress
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.php [L]
+</IfModule>
+
+# END WordPress
diff -uNr a/mp-wp/default_avatar.svg b/mp-wp/default_avatar.svg
--- a/mp-wp/default_avatar.svg false
+++ b/mp-wp/default_avatar.svg cca87ff9a6f97d42411db6fd42cee777115a40b39622d47d184b8c446bb8a4375de43a70471b7e5260ceec0434ab90c70e220a3e75dbf2984bd2679add03458b
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="31px" viewBox="0 0 32 31" enable-background="new 0 0 32 31" xml:space="preserve">  <image id="image0" width="32" height="31" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+t/G/AIuGAefHCSAAAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/favicon.svg b/mp-wp/favicon.svg
--- a/mp-wp/favicon.svg false
+++ b/mp-wp/favicon.svg f8b9c170225c60751012c022ecf52406e2edacfa5d8654ad9c8c3ad00cc4ec6f3748ecc54e90f8fd38bf826342d250cfb9ce2d5f94d14e725578da20068088d9
@@ -0,0 +1 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg id="Layer_1" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"><image id="image0" width="32" height="32" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ cwAADdcAAA3XAUIom3gAAAAHdElNRQfiBA0GBi4es7jPAAACj0lEQVQ4y02SPYhddRTE5//ue7vr rqhBFvxgN5UgShCx2EKxSbMENNpYWQiCpLNQLNMaREWxSJNUKho7xcQi2igWQpogRizUWGRh84HZ 5b57/x/nnJ/FC1mnnjMznBkFYIVWHTJABgtwKhSygB4CYI+w5mCwDxn6ALUIkI6MFcC2pjLXtFP3 1Icj9DGZpt6F1r+ZSbk/v2p9NzGz8ea7505WrSVloDD76bAZsHlpiYp1QN15sEKIDBS17U8YOP1C qEQ0USnXVwETxr4x5ZeNgb2Nay4wJoXdi0+c9EqTOxCCox9z6tXw5TkFJd1z5HSDEVEcahd2ef2f 9b8aYg+EcwcCoiDgxc03aHReGuk2dwlj0DBh9dLm1ZFBMJAo/1OozRFOa1RY2QcX411Cy4DuUxuJ nqbUtTqTDiwMbgIVy7BLjIBxADGvwMAQAF6BXfIBRYHBSNBYGJeAWNQLMEl4aCUkpJCkSKOCJBVJ qspw5ySDz/G2EKRR5zawiGuFxVAqNDMa0QOLV5NpUMkwx8yc1hgh5+AWiAJSYuTy2m38hyUJaVUr T56xhqECxuHfCnyw/FlPvfJIhRT8+/XW2xG4yIz+2vsM+eV3TgScOsG8dvQ5dtagLjLsf3e0p3/o xmM0nv5xADXg6iEaVQQVn+3x7XGe/cP/fqCHOqW/fvGZNyEzISlpsn2hfn9seOmCzr+yJptZOvTo W69/pP3lkIMRX27XrV/5+Zg9/zk+khhxcyhNAY7tPPznBsbj11bAGRIM0BbbkXeg5zbXzpbu+P3l iyXFJNVJh6ItJwmcgPf0FXBOnxLg05HK6FCzcAi4otrjv3e3ghs+k8CN5kQiJqEJSi1NRZL6eyOm kWymSMm6/wBM4RyPp1z/eAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wNC0xM1QxMzowNjo0Ni0w NzowMAXzFgcAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDQtMTNUMTM6MDY6NDYtMDc6MDB0rq67 AAAAAElFTkSuQmCC"></image></svg>
diff -uNr a/mp-wp/index.php b/mp-wp/index.php
--- a/mp-wp/index.php false
+++ b/mp-wp/index.php 558cf5ce0735068c3642be41c541d5b21becf6f7364fd40b2256a17f0a4dad27319777fc5006bcd1cc9776c3dbc334282c3fe92d8d134628c2cc27b91b887c95
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Front to the WordPress application. This file doesn't do anything, but loads
+ * wp-blog-header.php which does and tells WordPress to load the theme.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tells WordPress to load the WordPress theme and output it.
+ *
+ * @var bool
+ */
+define('WP_USE_THEMES', true);
+
+/** Loads the WordPress Environment and Template */
+require('./wp-blog-header.php');
+?>
\ No newline at end of file
diff -uNr a/mp-wp/manifest b/mp-wp/manifest
--- a/mp-wp/manifest false
+++ b/mp-wp/manifest 52ca7411d3f3a06cd9ba81db190ad147d74702f8033b36f259cf8a59f62fd30d72a1dfde3b286519575694ed43a513ab1a317fb01b0868bc3ba82a3521d5e934
@@ -0,0 +1 @@
+526913 mp-wp_genesis hanbot The historical MP-WP: WordPress with better antispam, SVG-enated images, and very basic themes, with a view towards minimalizing Mullenweg & Co.'s crud.
diff -uNr a/mp-wp/pingback-updater.php b/mp-wp/pingback-updater.php
--- a/mp-wp/pingback-updater.php false
+++ b/mp-wp/pingback-updater.php 219a4fc0cdfe92c1972a536e37c4d3d9dca6758d744eb7391787d87434543f1bb2961305a0f4dab21ee42bde64bc0870b70981eecad38a29f308123bb42b76b5
@@ -0,0 +1,48 @@
+<?
+// Db connect data.
+
+$db_name = '';
+$db_user = '';
+$db_pass = '';
+
+$table_prefix  = '';
+
+$nconnection = mysql_connect("localhost", $db_user, $db_pass );
+mysql_select_db($db_name, $nconnection);
+
+// Index of post at which script last ran. Script won't look through earlier posts. You have to update the value manually. 
+$last_run = 61145; 
+
+// Part one : select all the posts that contain a link to your own blog. Replace the url adequately.
+$local = "http://trilema.com/";
+
+$query = 'SELECT YEAR(post_date), post_name, post_content FROM '.$table_prefix.'posts WHERE post_type ="post" AND post_content LIKE "%<a href=%" AND ID > '.$last_run;
+$record = mysql_query($query);
+
+while (	$row = mysql_fetch_array($record, MYSQL_NUM)) {
+  $post_url = "http://trilema.com/".$row[0]."/".$row[1];
+ // echo "<h1>",$post_url,"</h1>";
+
+$dom = new DOMDocument();
+@$dom->loadHTML($row[2]);
+ 
+$xpath = new DOMXPath($dom);
+$hrefs = $xpath->evaluate("/html/body//a");
+
+for ($i = 0; $i < $hrefs->length; $i++) {
+	$href = $hrefs->item($i);
+	$url = $href->getAttribute('href');
+
+        $parse = parse_url($url);
+ echo 'curl -A "Mozilla/5.0" -r 0-4096 --connect-timeout 30 --max-time 10 "http://';
+ echo $parse['host'];
+ echo '/xmlrpc.php" --header "Content-Type: text/xml" --data "<?xmlversion="1.0"?><methodCall><methodName>pingback.ping</methodName><params><param><value><string>';
+ echo $post_url;
+ echo '</string></value></param><param><value><string>';
+ echo $url;
+ echo '</string></value></param></params></methodCall>"'."\n";
+}
+  
+}
+
+?>
diff -uNr a/mp-wp/wp-admin/.htaccess b/mp-wp/wp-admin/.htaccess
--- a/mp-wp/wp-admin/.htaccess false
+++ b/mp-wp/wp-admin/.htaccess 370e5ad18fb7341fb1e0ada7924fc3e68832658a32756a7ebb4fb6bdb477ed5617807d8c7b787f9afde35f6f1c492742e57434dffe7754ab2deebe272870c6bd
@@ -0,0 +1,3 @@
+Order deny,allow
+#Deny from all
+Allow from all
diff -uNr a/mp-wp/wp-admin/admin-ajax.php b/mp-wp/wp-admin/admin-ajax.php
--- a/mp-wp/wp-admin/admin-ajax.php false
+++ b/mp-wp/wp-admin/admin-ajax.php 15dbf0bc5478ce0bd9c2a705c7ab4a7701e13cc6590a8b47211f39e8a6bc6a8dab0ac895b8ad360aaf9ca6727fe2cdef554b21be787b9a746a1feb5eb28c531f
@@ -0,0 +1,1044 @@
+<?php
+/**
+ * WordPress AJAX Process Execution.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * Executing AJAX process.
+ *
+ * @since unknown
+ */
+define('DOING_AJAX', true);
+define('WP_ADMIN', true);
+
+require_once('../wp-load.php');
+require_once('includes/admin.php');
+
+if ( ! is_user_logged_in() ) {
+
+	if ( $_POST['action'] == 'autosave' ) {
+		$id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0;
+
+		if ( ! $id )
+			die('-1');
+
+		$message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() );
+			$x = new WP_Ajax_Response( array(
+				'what' => 'autosave',
+				'id' => $id,
+				'data' => $message
+			) );
+			$x->send();
+	}
+
+	die('-1');
+}
+
+if ( isset( $_GET['action'] ) ) :
+switch ( $action = $_GET['action'] ) :
+case 'ajax-tag-search' :
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	$s = $_GET['q']; // is this slashed already?
+
+	if ( false !== strpos( $s, ',' ) ) {
+		$s = explode( ',', $s );
+		$s = $s[count( $s ) - 1];
+	}
+	$s = trim( $s );
+	if ( strlen( $s ) < 2 )
+		die; // require 2 chars for matching
+	$results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = 'post_tag' AND t.name LIKE ('%". $s . "%')" );
+	echo join( $results, "\n" );
+	die;
+	break;
+default :
+	do_action( 'wp_ajax_' . $_GET['action'] );
+	die('0');
+	break;
+endswitch;
+endif;
+
+$id = isset($_POST['id'])? (int) $_POST['id'] : 0;
+switch ( $action = $_POST['action'] ) :
+case 'delete-comment' :
+	check_ajax_referer( "delete-comment_$id" );
+	if ( !$comment = get_comment( $id ) )
+		die('1');
+	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+		die('-1');
+
+	if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
+		if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
+			die('1');
+		$r = wp_set_comment_status( $comment->comment_ID, 'spam' );
+	} else {
+		$r = wp_delete_comment( $comment->comment_ID );
+	}
+
+	die( $r ? '1' : '0' );
+	break;
+case 'delete-cat' :
+	check_ajax_referer( "delete-category_$id" );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	$cat = get_category( $id );
+	if ( !$cat || is_wp_error( $cat ) )
+		die('1');
+
+	if ( wp_delete_category( $id ) )
+		die('1');
+	else
+		die('0');
+	break;
+case 'delete-tag' :
+	check_ajax_referer( "delete-tag_$id" );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	$tag = get_term( $id, 'post_tag' );
+	if ( !$tag || is_wp_error( $tag ) )
+		die('1');
+
+	if ( wp_delete_term($id, 'post_tag'))
+		die('1');
+	else
+		die('0');
+	break;
+case 'delete-link-cat' :
+	check_ajax_referer( "delete-link-category_$id" );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	$cat = get_term( $id, 'link_category' );
+	if ( !$cat || is_wp_error( $cat ) )
+		die('1');
+
+	$cat_name = get_term_field('name', $id, 'link_category');
+
+	// Don't delete the default cats.
+	if ( $id == get_option('default_link_category') ) {
+		$x = new WP_AJAX_Response( array(
+			'what' => 'link-cat',
+			'id' => $id,
+			'data' => new WP_Error( 'default-link-cat', sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name) )
+		) );
+		$x->send();
+	}
+
+	$r = wp_delete_term($id, 'link_category');
+	if ( !$r )
+		die('0');
+	if ( is_wp_error($r) ) {
+		$x = new WP_AJAX_Response( array(
+			'what' => 'link-cat',
+			'id' => $id,
+			'data' => $r
+		) );
+		$x->send();
+	}
+	die('1');
+	break;
+case 'delete-link' :
+	check_ajax_referer( "delete-bookmark_$id" );
+	if ( !current_user_can( 'manage_links' ) )
+		die('-1');
+
+	$link = get_bookmark( $id );
+	if ( !$link || is_wp_error( $link ) )
+		die('1');
+
+	if ( wp_delete_link( $id ) )
+		die('1');
+	else
+		die('0');
+	break;
+case 'delete-meta' :
+	check_ajax_referer( "delete-meta_$id" );
+	if ( !$meta = get_post_meta_by_id( $id ) )
+		die('1');
+
+	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' :
+	check_ajax_referer( "{$action}_$id" );
+	if ( !current_user_can( 'delete_post', $id ) )
+		die('-1');
+
+	if ( !get_post( $id ) )
+		die('1');
+
+	if ( wp_delete_post( $id ) )
+		die('1');
+	else
+		die('0');
+	break;
+case 'delete-page' :
+	check_ajax_referer( "{$action}_$id" );
+	if ( !current_user_can( 'delete_page', $id ) )
+		die('-1');
+
+	if ( !get_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');
+
+	$current = wp_get_comment_status( $comment->comment_ID );
+	if ( $_POST['new'] == $current )
+		die('1');
+
+	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
+		check_ajax_referer( "approve-comment_$id" );
+		if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
+			die('1');
+	} else {
+		check_ajax_referer( "unapprove-comment_$id" );
+		if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
+			die('1');
+	}
+	die('0');
+	break;
+case 'add-category' : // On the Fly
+	check_ajax_referer( $action );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+	$names = explode(',', $_POST['newcat']);
+	if ( 0 > $parent = (int) $_POST['newcat_parent'] )
+		$parent = 0;
+	$post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array();
+	$checked_categories = array_map( 'absint', (array) $post_category );
+	$popular_ids = isset( $_POST['popular_ids'] ) ?
+			array_map( 'absint', explode( ',', $_POST['popular_ids'] ) ) :
+			false;
+
+	$x = new WP_Ajax_Response();
+	foreach ( $names as $cat_name ) {
+		$cat_name = trim($cat_name);
+		$category_nicename = sanitize_title($cat_name);
+		if ( '' === $category_nicename )
+			continue;
+		$cat_id = wp_create_category( $cat_name, $parent );
+		$checked_categories[] = $cat_id;
+		if ( $parent ) // Do these all at once in a second
+			continue;
+		$category = get_category( $cat_id );
+		ob_start();
+			wp_category_checklist( 0, $cat_id, $checked_categories, $popular_ids );
+		$data = ob_get_contents();
+		ob_end_clean();
+		$x->add( array(
+			'what' => 'category',
+			'id' => $cat_id,
+			'data' => $data,
+			'position' => -1
+		) );
+	}
+	if ( $parent ) { // Foncy - replace the parent and all its children
+		$parent = get_category( $parent );
+		ob_start();
+			dropdown_categories( 0, $parent );
+		$data = ob_get_contents();
+		ob_end_clean();
+		$x->add( array(
+			'what' => 'category',
+			'id' => $parent->term_id,
+			'old_id' => $parent->term_id,
+			'data' => $data,
+			'position' => -1
+		) );
+
+	}
+	$x->send();
+	break;
+case 'add-link-category' : // On the Fly
+	check_ajax_referer( $action );
+	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);
+		$slug = sanitize_title($cat_name);
+		if ( '' === $slug )
+			continue;
+		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>",
+			'position' => -1
+		) );
+	}
+	$x->send();
+	break;
+case 'add-cat' : // From Manage->Categories
+	check_ajax_referer( 'add-category' );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	if ( '' === trim($_POST['cat_name']) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'cat',
+			'id' => new WP_Error( 'cat_name', __('You did not enter a category name.') )
+		) );
+		$x->send();
+	}
+
+	if ( category_exists( trim( $_POST['cat_name'] ) ) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'cat',
+			'id' => new WP_Error( 'cat_exists', __('The category you are trying to create already exists.'), array( 'form-field' => 'cat_name' ) ),
+		) );
+		$x->send();
+	}
+
+	$cat = wp_insert_category( $_POST, true );
+
+	if ( is_wp_error($cat) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'cat',
+			'id' => $cat
+		) );
+		$x->send();
+	}
+
+	if ( !$cat || (!$cat = get_category( $cat )) )
+		die('0');
+
+	$level = 0;
+	$cat_full_name = $cat->name;
+	$_cat = $cat;
+	while ( $_cat->parent ) {
+		$_cat = get_category( $_cat->parent );
+		$cat_full_name = $_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->term_id,
+		'position' => -1,
+		'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->term_id", $cat_full_name))
+	) );
+	$x->send();
+	break;
+case 'add-link-cat' : // From Blogroll -> Categories
+	check_ajax_referer( 'add-link-category' );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	if ( '' === trim($_POST['name']) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'link-cat',
+			'id' => new WP_Error( 'name', __('You did not enter a category name.') )
+		) );
+		$x->send();
+	}
+
+	$r = wp_insert_term($_POST['name'], 'link_category', $_POST );
+	if ( is_wp_error( $r ) ) {
+		$x = new WP_AJAX_Response( array(
+			'what' => 'link-cat',
+			'id' => $r
+		) );
+		$x->send();
+	}
+
+	extract($r, EXTR_SKIP);
+
+	if ( !$link_cat = link_cat_row( $term_id ) )
+		die('0');
+
+	$x = new WP_Ajax_Response( array(
+		'what' => 'link-cat',
+		'id' => $term_id,
+		'position' => -1,
+		'data' => $link_cat
+	) );
+	$x->send();
+	break;
+case 'add-tag' : // From Manage->Tags
+	check_ajax_referer( 'add-tag' );
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	if ( '' === trim($_POST['name']) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'tag',
+			'id' => new WP_Error( 'name', __('You did not enter a tag name.') )
+		) );
+		$x->send();
+	}
+
+	$tag = wp_insert_term($_POST['name'], 'post_tag', $_POST );
+
+	if ( is_wp_error($tag) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'tag',
+			'id' => $tag
+		) );
+		$x->send();
+	}
+
+	if ( !$tag || (!$tag = get_term( $tag['term_id'], 'post_tag' )) )
+		die('0');
+
+	$tag_full_name = $tag->name;
+	$tag_full_name = attribute_escape($tag_full_name);
+
+	$x = new WP_Ajax_Response( array(
+		'what' => 'tag',
+		'id' => $tag->term_id,
+		'position' => '-1',
+		'data' => _tag_row( $tag ),
+		'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name))
+	) );
+	$x->send();
+	break;
+case 'get-tagcloud' :
+	if ( !current_user_can( 'manage_categories' ) )
+		die('-1');
+
+	$tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
+
+	if ( empty( $tags ) )
+		die( __('No tags found!') );
+
+	foreach ( $tags as $key => $tag ) {
+		$tags[ $key ]->link = '#';
+		$tags[ $key ]->id = $tag->term_id;
+	}
+
+	$return = wp_generate_tag_cloud( $tags );
+
+	if ( empty($return) )
+		die('0');
+
+	echo $return;
+
+	exit;
+	break;
+case 'add-comment' :
+	check_ajax_referer( $action );
+	if ( !current_user_can( 'edit_post', $id ) )
+		die('-1');
+	$search = isset($_POST['s']) ? $_POST['s'] : false;
+	$start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24;
+	$status = isset($_POST['comment_status']) ? $_POST['comment_status'] : false;
+	$mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail';
+	$p = isset($_POST['p']) ? $_POST['p'] : 0;
+	$comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : '';
+	list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1, $p, $comment_type );
+
+	if ( get_option('show_avatars') )
+		add_filter( 'comment_author', 'floated_admin_avatar' );
+
+	if ( !$comments )
+		die('1');
+	$x = new WP_Ajax_Response();
+	foreach ( (array) $comments as $comment ) {
+		get_comment( $comment );
+		ob_start();
+			_wp_comment_row( $comment->comment_ID, $mode, $status, true, true );
+			$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 'get-comments' :
+	check_ajax_referer( $action );
+
+	$post_ID = (int) $_POST['post_ID'];
+	if ( !current_user_can( 'edit_post', $post_ID ) )
+		die('-1');
+
+	$start = isset($_POST['start']) ? intval($_POST['start']) : 0;
+	$num = isset($_POST['num']) ? intval($_POST['num']) : 10;
+
+	list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID );
+
+	if ( !$comments )
+		die('1');
+
+	$comment_list_item = '';
+	$x = new WP_Ajax_Response();
+	foreach ( (array) $comments as $comment ) {
+		get_comment( $comment );
+		ob_start();
+			_wp_comment_row( $comment->comment_ID, 'single', false, false );
+			$comment_list_item .= ob_get_contents();
+		ob_end_clean();
+	}
+	$x->add( array(
+		'what' => 'comments',
+		'data' => $comment_list_item
+	) );
+	$x->send();
+	break;
+case 'replyto-comment' :
+	check_ajax_referer( $action );
+
+	$comment_post_ID = (int) $_POST['comment_post_ID'];
+	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
+		die('-1');
+
+	$status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
+
+	if ( empty($status) )
+		die('1');
+	elseif ( in_array($status, array('draft', 'pending') ) )
+		die( __('Error: you are replying to a comment on a draft post.') );
+
+	$user = wp_get_current_user();
+	if ( $user->ID ) {
+		$comment_author       = $wpdb->escape($user->display_name);
+		$comment_author_email = $wpdb->escape($user->user_email);
+		$comment_author_url   = $wpdb->escape($user->user_url);
+		$comment_content      = trim($_POST['content']);
+		if ( current_user_can('unfiltered_html') ) {
+			if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
+				kses_remove_filters(); // start with a clean slate
+				kses_init_filters(); // set up the filters
+			}
+		}
+	} else {
+		die( __('Sorry, you must be logged in to reply to a comment.') );
+	}
+
+	if ( '' == $comment_content )
+		die( __('Error: please type a comment.') );
+
+	$comment_parent = absint($_POST['comment_ID']);
+	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+
+	$comment_id = wp_new_comment( $commentdata );
+	$comment = get_comment($comment_id);
+	if ( ! $comment ) die('1');
+
+	$modes = array( 'single', 'detail', 'dashboard' );
+	$mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail';
+	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
+
+	if ( get_option('show_avatars') && 'single' != $mode )
+		add_filter( 'comment_author', 'floated_admin_avatar' );
+
+	$x = new WP_Ajax_Response();
+
+	ob_start();
+		if ( 'dashboard' == $mode ) {
+			require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
+			_wp_dashboard_recent_comments_row( $comment, false );
+		} else {
+			_wp_comment_row( $comment->comment_ID, $mode, false, $checkbox );
+		}
+		$comment_list_item = ob_get_contents();
+	ob_end_clean();
+
+	$x->add( array(
+		'what' => 'comment',
+		'id' => $comment->comment_ID,
+		'data' => $comment_list_item,
+		'position' => $position
+	));
+
+	$x->send();
+	break;
+case 'edit-comment' :
+	check_ajax_referer( 'replyto-comment' );
+
+	$comment_post_ID = (int) $_POST['comment_post_ID'];
+	if ( ! current_user_can( 'edit_post', $comment_post_ID ) )
+		die('-1');
+
+	if ( '' == $_POST['content'] )
+		die( __('Error: please type a comment.') );
+
+	$comment_id = (int) $_POST['comment_ID'];
+	$_POST['comment_status'] = $_POST['status'];
+	edit_comment();
+
+	$mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
+	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
+
+	if ( get_option('show_avatars') && 'single' != $mode )
+		add_filter( 'comment_author', 'floated_admin_avatar' );
+
+	$x = new WP_Ajax_Response();
+
+	ob_start();
+		_wp_comment_row( $comment_id, $mode, true, $checkbox );
+		$comment_list_item = ob_get_contents();
+	ob_end_clean();
+
+	$x->add( array(
+		'what' => 'edit_comment',
+		'id' => $comment->comment_ID,
+		'data' => $comment_list_item,
+		'position' => $position
+	));
+
+	$x->send();
+	break;
+case 'add-meta' :
+	check_ajax_referer( 'add-meta' );
+	$c = 0;
+	$pid = (int) $_POST['post_id'];
+	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
+		if ( !current_user_can( 'edit_post', $pid ) )
+			die('-1');
+		if ( '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
+			die('1');
+		if ( $pid < 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 ) ) {
+					$x = new WP_Ajax_Response( array(
+						'what' => 'meta',
+						'data' => $pid
+					) );
+					$x->send();
+				}
+				$mid = add_meta( $pid );
+			} else {
+				die('0');
+			}
+		} else if ( !$mid = add_meta( $pid ) ) {
+			die('0');
+		}
+
+		$meta = get_post_meta_by_id( $mid );
+		$pid = (int) $meta->post_id;
+		$meta = get_object_vars( $meta );
+		$x = new WP_Ajax_Response( array(
+			'what' => 'meta',
+			'id' => $mid,
+			'data' => _list_meta_row( $meta, $c ),
+			'position' => 1,
+			'supplemental' => array('postid' => $pid)
+		) );
+	} else {
+		$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 ) )
+			die('1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+		$key = stripslashes($key);
+		$value = stripslashes($value);
+		$x = new WP_Ajax_Response( array(
+			'what' => 'meta',
+			'id' => $mid, 'old_id' => $mid,
+			'data' => _list_meta_row( array(
+				'meta_key' => $key,
+				'meta_value' => $value,
+				'meta_id' => $mid
+			), $c ),
+			'position' => 0,
+			'supplemental' => array('postid' => $meta->post_id)
+		) );
+	}
+	$x->send();
+	break;
+case 'add-user' :
+	check_ajax_referer( $action );
+	if ( !current_user_can('create_users') )
+		die('-1');
+	require_once(ABSPATH . WPINC . '/registration.php');
+	if ( !$user_id = add_user() )
+		die('0');
+	elseif ( is_wp_error( $user_id ) ) {
+		$x = new WP_Ajax_Response( array(
+			'what' => 'user',
+			'id' => $user_id
+		) );
+		$x->send();
+	}
+	$user_object = new WP_User( $user_id );
+
+	$x = new WP_Ajax_Response( array(
+		'what' => 'user',
+		'id' => $user_id,
+		'data' => user_row( $user_object, '', $user_object->roles[0] ),
+		'supplemental' => array(
+			'show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),
+			'role' => $user_object->roles[0]
+		)
+	) );
+	$x->send();
+	break;
+case 'autosave' : // The name of this action is hardcoded in edit_post()
+	define( 'DOING_AUTOSAVE', true );
+
+	$nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
+	global $current_user;
+
+	$_POST['post_category'] = explode(",", $_POST['catslist']);
+	$_POST['tags_input'] = explode(",", $_POST['tags_input']);
+	if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
+		unset($_POST['post_category']);
+
+	$do_autosave = (bool) $_POST['autosave'];
+	$do_lock = true;
+
+	$data = '';
+	$message = sprintf( __('Draft Saved at %s.'), date( __('g:i:s a'), current_time( 'timestamp', true ) ) );
+
+	$supplemental = array();
+
+	$id = $revision_id = 0;
+	if($_POST['post_ID'] < 0) {
+		$_POST['post_status'] = 'draft';
+		$_POST['temp_ID'] = $_POST['post_ID'];
+		if ( $do_autosave ) {
+			$id = wp_write_post();
+			$data = $message;
+		}
+	} else {
+		$post_ID = (int) $_POST['post_ID'];
+		$_POST['ID'] = $post_ID;
+		$post = get_post($post_ID);
+
+		if ( $last = wp_check_post_lock( $post->ID ) ) {
+			$do_autosave = $do_lock = false;
+
+			$last_user = get_userdata( $last );
+			$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
+			$data = new WP_Error( 'locked', sprintf(
+				$_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
+				wp_specialchars( $last_user_name )
+			) );
+
+			$supplemental['disable_autosave'] = 'disable';
+		}
+
+		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.'));
+		}
+
+		if ( $do_autosave ) {
+			// Drafts are just overwritten by autosave
+			if ( 'draft' == $post->post_status ) {
+				$id = edit_post();
+			} else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
+				$revision_id = wp_create_post_autosave( $post->ID );
+				if ( is_wp_error($revision_id) )
+					$id = $revision_id;
+				else
+					$id = $post->ID;
+			}
+			$data = $message;
+		} else {
+			$id = $post->ID;
+		}
+	}
+
+	if ( $do_lock && $id && is_numeric($id) )
+		wp_set_post_lock( $id );
+
+	if ( $nonce_age == 2 ) {
+		$supplemental['replace-autosavenonce'] = wp_create_nonce('autosave');
+		$supplemental['replace-getpermalinknonce'] = wp_create_nonce('getpermalink');
+		$supplemental['replace-samplepermalinknonce'] = wp_create_nonce('samplepermalink');
+		$supplemental['replace-closedpostboxesnonce'] = wp_create_nonce('closedpostboxes');
+		if ( $id ) {
+			if ( $_POST['post_type'] == 'post' )
+				$supplemental['replace-_wpnonce'] = wp_create_nonce('update-post_' . $id);
+			elseif ( $_POST['post_type'] == 'page' )
+				$supplemental['replace-_wpnonce'] = wp_create_nonce('update-page_' . $id);
+		}
+	}
+
+	$x = new WP_Ajax_Response( array(
+		'what' => 'autosave',
+		'id' => $id,
+		'data' => $id ? $data : '',
+		'supplemental' => $supplemental
+	) );
+	$x->send();
+	break;
+case 'autosave-generate-nonces' :
+	check_ajax_referer( 'autosave', 'autosavenonce' );
+	$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;
+case 'closed-postboxes' :
+	check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
+	$closed = isset( $_POST['closed'] )? $_POST['closed'] : '';
+	$closed = explode( ',', $_POST['closed'] );
+	$hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
+	$hidden = explode( ',', $_POST['hidden'] );
+	$page = isset( $_POST['page'] )? $_POST['page'] : '';
+	if ( !preg_match( '/^[a-z-_]+$/', $page ) ) {
+		die(-1);
+	}
+	$current_user = wp_get_current_user();
+	if ( is_array($closed) )
+		update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed);
+	if ( is_array($hidden) )
+		update_usermeta($current_user->ID, 'meta-box-hidden_'.$page, $hidden);
+break;
+case 'hidden-columns' :
+	check_ajax_referer( 'hiddencolumns', 'hiddencolumnsnonce' );
+	$hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
+	$hidden = explode( ',', $_POST['hidden'] );
+	$page = isset( $_POST['page'] )? $_POST['page'] : '';
+	if ( !preg_match( '/^[a-z-_]+$/', $page ) ) {
+		die(-1);
+	}
+	$current_user = wp_get_current_user();
+	if ( is_array($hidden) )
+		update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden);
+break;
+case 'get-permalink':
+	check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
+	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
+	die(add_query_arg(array('preview' => 'true'), get_permalink($post_id)));
+break;
+case 'sample-permalink':
+	check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
+	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
+	$title = isset($_POST['new_title'])? $_POST['new_title'] : '';
+	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
+	die(get_sample_permalink_html($post_id, $title, $slug));
+break;
+case 'inline-save':
+	check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
+
+	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) )
+		exit;
+
+	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.') );
+	}
+
+	if ( $last = wp_check_post_lock( $post_ID ) ) {
+		$last_user = get_userdata( $last );
+		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
+		printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ),	wp_specialchars( $last_user_name ) );
+		exit;
+	}
+
+	$data = &$_POST;
+	$post = get_post( $post_ID, ARRAY_A );
+	$data['content'] = $post['post_content'];
+	$data['excerpt'] = $post['post_excerpt'];
+
+	// rename
+	$data['user_ID'] = $GLOBALS['user_ID'];
+
+	if ( isset($data['post_parent']) )
+		$data['parent_id'] = $data['post_parent'];
+
+	// status
+	if ( isset($data['keep_private']) && 'private' == $data['keep_private'] )
+		$data['post_status'] = 'private';
+	else
+		$data['post_status'] = $data['_status'];
+
+	if ( empty($data['comment_status']) )
+		$data['comment_status'] = 'closed';
+	if ( empty($data['ping_status']) )
+		$data['ping_status'] = 'closed';
+
+	// update the post
+	$_POST = $data;
+	edit_post();
+
+	$post = array();
+	if ( 'page' == $_POST['post_type'] ) {
+		$post[] = get_post($_POST['post_ID']);
+		page_rows($post);
+	} elseif ( 'post' == $_POST['post_type'] ) {
+		$mode = $_POST['post_view'];
+		$post[] = get_post($_POST['post_ID']);
+		post_rows($post);
+	}
+
+	exit;
+	break;
+case 'inline-save-tax':
+	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
+
+	if ( ! current_user_can('manage_categories') )
+		die( __('Cheatin&#8217; uh?') );
+
+	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
+		die(-1);
+
+	switch ($_POST['tax_type']) {
+		case 'cat' :
+			$data = array();
+			$data['cat_ID'] = $id;
+			$data['cat_name'] = $_POST['name'];
+			$data['category_nicename'] = $_POST['slug'];
+			if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 )
+				$data['category_parent'] = $_POST['parent'];
+
+			$cat = get_category($id, ARRAY_A);
+			$data['category_description'] = $cat['category_description'];
+
+			$updated = wp_update_category($data);
+
+			if ( $updated && !is_wp_error($updated) )
+				echo _cat_row( $updated, 0 );
+			else
+				die( __('Category not updated.') );
+
+			break;
+		case 'link-cat' :
+			$updated = wp_update_term($id, 'link_category', $_POST);
+
+			if ( $updated && !is_wp_error($updated) )
+				echo link_cat_row($updated['term_id']);
+			else
+				die( __('Category not updated.') );
+
+			break;
+		case 'tag' :
+			$updated = wp_update_term($id, 'post_tag', $_POST);
+			if ( $updated && !is_wp_error($updated) ) {
+				$tag = get_term( $updated['term_id'], 'post_tag' );
+				if ( !$tag || is_wp_error( $tag ) )
+					die( __('Tag not updated.') );
+
+				echo _tag_row($tag);
+			} else {
+				die( __('Tag not updated.') );
+			}
+
+			break;
+	}
+
+	exit;
+	break;
+case 'meta-box-order':
+	check_ajax_referer( 'meta-box-order' );
+	update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] );
+	die('1');
+	break;
+case 'find_posts':
+	check_ajax_referer( 'find-posts' );
+
+	if ( empty($_POST['ps']) )
+		exit;
+
+	$what = isset($_POST['pages']) ? 'page' : 'post';
+	$s = stripslashes($_POST['ps']);
+	preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
+	$search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
+
+	$searchand = $search = '';
+	foreach( (array) $search_terms as $term) {
+		$term = addslashes_gpc($term);
+		$search .= "{$searchand}(($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%'))";
+		$searchand = ' AND ';
+	}
+	$term = $wpdb->escape($s);
+	if ( count($search_terms) > 1 && $search_terms[0] != $s )
+		$search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')";
+
+	$posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND $search ORDER BY post_date_gmt DESC LIMIT 50" );
+
+	if ( ! $posts )
+		exit( __('No posts found.') );
+
+	$html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Time').'</th><th>'.__('Status').'</th></tr></thead><tbody>';
+	foreach ( $posts as $post ) {
+
+		switch ( $post->post_status ) {
+			case 'publish' :
+			case 'private' :
+				$stat = __('Published');
+				break;
+			case 'future' :
+				$stat = __('Scheduled');
+				break;
+			case 'pending' :
+				$stat = __('Pending Review');
+				break;
+			case 'draft' :
+				$stat = __('Unpublished');
+				break;
+		}
+
+		if ( '0000-00-00 00:00:00' == $post->post_date ) {
+			$time = '';
+		} else {
+			$time = mysql2date(__('Y/m/d'), $post->post_date);
+		}
+
+		$html .= '<tr class="found-posts"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="'.$post->ID.'"></td>';
+		$html .= '<td><label for="found-'.$post->ID.'">'.wp_specialchars($post->post_title, true).'</label></td><td>'.wp_specialchars($time, true).'</td><td>'.wp_specialchars($stat, true).'</td></tr>'."\n\n";
+	}
+	$html .= '</tbody></table>';
+
+	$x = new WP_Ajax_Response();
+	$x->add( array(
+		'what' => $what,
+		'data' => $html
+	));
+	$x->send();
+
+	break;
+default :
+	do_action( 'wp_ajax_' . $_POST['action'] );
+	die('0');
+	break;
+endswitch;
+?>
diff -uNr a/mp-wp/wp-admin/admin-footer.php b/mp-wp/wp-admin/admin-footer.php
--- a/mp-wp/wp-admin/admin-footer.php false
+++ b/mp-wp/wp-admin/admin-footer.php 6a85d8646f911c892da3e7753a5a49f408c854070abcfd418440ebf76548a350d3f87122a335c8640dc2c22ab37e80ca9af907279d87b57b3142fd74f10bd201
@@ -0,0 +1,28 @@
+<?php
+/**
+ * WordPress Administration Template Footer
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+?>
+
+<div class="clear"></div></div><!-- wpbody-content -->
+<div class="clear"></div></div><!-- wpbody -->
+<div class="clear"></div></div><!-- wpcontent -->
+</div><!-- wpwrap -->
+
+<div id="footer">
+<p id="footer-left" class="alignleft"><?php
+do_action( 'in_admin_footer' );
+$upgrade = apply_filters( 'update_footer', '' );
+echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>'); ?>
+</p>
+<?php // if ( $is_IE ) browse_happy(); ?>
+<p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p>
+<div class="clear"></div>
+</div>
+<?php do_action('admin_footer', ''); ?>
+<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+</body>
+</html>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/admin-functions.php b/mp-wp/wp-admin/admin-functions.php
--- a/mp-wp/wp-admin/admin-functions.php false
+++ b/mp-wp/wp-admin/admin-functions.php 3c9d89c3df6be79c98b1bc3c4f85a7ab1716eca447c3358c607b0c25de4c2e4d8730ad1db90b90cbd36503c6ed85cc84f6f585702a1c93fbfca4d7ebffaa8693
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Administration Functions
+ *
+ * This file is deprecated, use 'wp-admin/includes/admin.php' instead.
+ *
+ * @deprecated 2.5
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' );
+
+/** WordPress Administration API: Includes all Administration functions. */
+require_once(ABSPATH . 'wp-admin/includes/admin.php');
+?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/admin-header.php b/mp-wp/wp-admin/admin-header.php
--- a/mp-wp/wp-admin/admin-header.php false
+++ b/mp-wp/wp-admin/admin-header.php 47fd2f478c57ac7d12039470357d95dde3401150d7d208dc1b3ebf7e057215458716e09c88a22642aa143d4cf49150291d61cb4e80909b5fc72515858a5c32ff
@@ -0,0 +1,132 @@
+<?php
+/**
+ * WordPress Administration Template Header
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+if (!isset($_GET["page"])) require_once('admin.php');
+
+get_admin_page_title();
+$title = wp_specialchars( strip_tags( $title ) );
+wp_user_settings();
+?>
+<!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(); ?>>
+<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 $title; ?> &#8212; WordPress</title>
+<?php
+
+wp_admin_css( 'css/global' );
+wp_admin_css();
+wp_admin_css( 'css/colors' );
+wp_admin_css( 'css/ie' );
+
+?>
+<script type="text/javascript">
+//<![CDATA[
+addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
+
+function convertEntities(o) {
+	var c = function(s) {
+		if (/&[^;]+;/.test(s)) {
+			var e = document.createElement("div");
+			e.innerHTML = s;
+			return !e.firstChild ? s : e.firstChild.nodeValue;
+		}
+		return s;
+	}
+
+	if ( typeof o === 'string' )
+		return c(o);
+	else if ( typeof o === 'object' )
+		for (var v in o) {
+			if ( typeof o[v] === 'string' )
+				o[v] = c(o[v]);
+		}
+	return o;
+};
+//]]>
+</script>
+<?php
+
+if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) {
+	add_action( 'admin_head', 'wp_tiny_mce' );
+}
+
+$hook_suffix = '';
+if ( isset($page_hook) )
+	$hook_suffix = "$page_hook";
+else if ( isset($plugin_page) )
+	$hook_suffix = "$plugin_page";
+else if ( isset($pagenow) )
+	$hook_suffix = "$pagenow";
+
+do_action("admin_print_styles-$hook_suffix");
+do_action('admin_print_styles');
+do_action("admin_print_scripts-$hook_suffix");
+do_action('admin_print_scripts');
+do_action("admin_head-$hook_suffix");
+do_action('admin_head');
+
+if ( $is_iphone ) { ?>
+<style type="text/css">.row-actions{visibility:visible;}</style>
+<?php } ?>
+</head>
+<body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
+
+<div id="wpwrap">
+<div id="wpcontent">
+<div id="wphead">
+<?php
+$blog_name = get_bloginfo('name', 'display');
+if ( '' == $blog_name ) {
+	$blog_name = '&nbsp;';
+} else {
+	$blog_name_excerpt = wp_html_excerpt($blog_name, 40);
+	if ( $blog_name != $blog_name_excerpt )
+		$blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
+	$blog_name = $blog_name_excerpt;
+}
+$title_class = '';
+if ( function_exists('mb_strlen') ) {
+	if ( mb_strlen($blog_name, 'UTF-8') > 30 )
+		$title_class = 'class="long-title"';
+} else {
+	if ( strlen($blog_name) > 30 )
+		$title_class = 'class="long-title"';
+}
+?>
+
+<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?> <span>&larr; <?php _e('Visit site') ?></span></a></h1>
+
+<div id="wphead-info">
+<div id="user_info">
+<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?>
+<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> |
+<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
+</div>
+
+<?php favorite_actions(); ?>
+</div>
+</div>
+
+<?php if ( get_user_setting('mfold') == 'f' ) { ?>
+<script type="text/javascript">jQuery('#wpcontent').addClass('folded');</script>
+<?php } ?>
+
+<div id="wpbody">
+<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+
+<div id="wpbody-content">
+<?php
+screen_meta($hook_suffix);
+
+do_action('admin_notices');
+
+if ( $parent_file == 'options-general.php' ) {
+	require(ABSPATH . 'wp-admin/options-head.php');
+}
diff -uNr a/mp-wp/wp-admin/admin-post.php b/mp-wp/wp-admin/admin-post.php
--- a/mp-wp/wp-admin/admin-post.php false
+++ b/mp-wp/wp-admin/admin-post.php 8bb26580e8716ae395d2bda17e2949d34d30f3c24b89d56f8f63dd90c4c6bdc506828bf16d4b9b31412e35075f36ee190b9b005c6e2aa971b7110b2a29d28ae2
@@ -0,0 +1,32 @@
+<?php
+/**
+ * WordPress Administration Generic POST Handler.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** We are located in WordPress Administration Panels */
+define('WP_ADMIN', true);
+
+if ( defined('ABSPATH') )
+	require_once(ABSPATH . 'wp-load.php');
+else
+	require_once('../wp-load.php');
+
+require_once(ABSPATH . 'wp-admin/includes/admin.php');
+
+if ( !wp_validate_auth_cookie() )
+	wp_die(__('Cheatin&#8217; uh?'));
+
+nocache_headers();
+
+do_action('admin_init');
+
+$action = 'admin_post';
+if ( !empty($_REQUEST['action']) )
+	$action .= '_' . $_REQUEST['action'];
+
+do_action($action);
+
+?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/admin.php b/mp-wp/wp-admin/admin.php
--- a/mp-wp/wp-admin/admin.php false
+++ b/mp-wp/wp-admin/admin.php f6b402db844d90d3ad27413bafa675eb850618c500175351f9bfd097e25f648b0df1c4b69c72d45b0d08a1efd83af097b90d09da87f5cc2332e90e6a7b71fc2f
@@ -0,0 +1,142 @@
+<?php
+/**
+ * WordPress Administration Bootstrap
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * In WordPress Administration Panels
+ *
+ * @since unknown
+ */
+define('WP_ADMIN', TRUE);
+
+if ( defined('ABSPATH') )
+	require_once(ABSPATH . 'wp-load.php');
+else
+	require_once('../wp-load.php');
+
+if ( get_option('db_version') != $wp_db_version ) {
+	wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
+	exit;
+}
+
+require_once(ABSPATH . 'wp-admin/includes/admin.php');
+
+auth_redirect();
+
+nocache_headers();
+
+update_category_cache();
+
+$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');
+
+wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
+
+wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
+wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));
+
+wp_enqueue_script( 'common' );
+wp_enqueue_script( 'jquery-color' );
+
+$editing = false;
+
+if (isset($_GET['page'])) {
+	$plugin_page = stripslashes($_GET['page']);
+	$plugin_page = plugin_basename($plugin_page);
+}
+
+require(ABSPATH . 'wp-admin/menu.php');
+
+do_action('admin_init');
+
+// Handle plugin admin pages.
+if (isset($plugin_page)) {
+	if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
+		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
+		// backwards compatibility for plugins using add_management_page
+		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+			wp_redirect('tools.php?page=' . $plugin_page);
+			exit;
+		}
+	}
+
+	if ( $page_hook ) {
+		do_action('load-' . $page_hook);
+		if (! isset($_GET['noheader']))
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+		do_action($page_hook);
+	} else {
+		if ( validate_file($plugin_page) ) {
+			wp_die(__('Invalid plugin page'));
+		}
+
+		if (! ( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) )
+			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+
+		do_action('load-' . $plugin_page);
+
+		if (! isset($_GET['noheader']))
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+		include(WP_PLUGIN_DIR . "/$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 ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! 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 = 'tools.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');
+
+	// Make sure rules are flushed
+	global $wp_rewrite;
+	$wp_rewrite->flush_rules();
+
+	exit();
+} else {
+	do_action("load-$pagenow");
+}
+
+if ( !empty($_REQUEST['action']) )
+	do_action('admin_action_' . $_REQUEST['action']);
+
+?>
diff -uNr a/mp-wp/wp-admin/async-upload.php b/mp-wp/wp-admin/async-upload.php
--- a/mp-wp/wp-admin/async-upload.php false
+++ b/mp-wp/wp-admin/async-upload.php e5128dd12c00925ab20dd786768c465010a73ba574a4307177381fe386b4eca7638d551dd7bb652d78b24d0a1e1f2c830db8467fb1f354d0c2ad422f1fd98a6d
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Accepts file uploads from swfupload or other asynchronous upload methods.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( defined('ABSPATH') )
+	require_once(ABSPATH . 'wp-load.php');
+else
+	require_once('../wp-load.php');
+
+// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
+if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+unset($current_user);
+require_once('admin.php');
+
+header('Content-Type: text/plain; charset=' . get_option('blog_charset'));
+
+if ( !current_user_can('upload_files') )
+	wp_die(__('You do not have permission to upload files.'));
+
+// just fetch the detail form for that attachment
+if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+	if ( 2 == $_REQUEST['fetch'] ) {
+		add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+		echo get_media_item($id, array( 'send' => false, 'delete' => false ));
+	} else {
+		echo get_media_item($id);
+	}
+	exit;
+}
+
+check_admin_referer('media-form');
+
+$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
+if (is_wp_error($id)) {
+	echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
+	exit;
+}
+
+if ( $_REQUEST['short'] ) {
+	// short form response - attachment ID only
+	echo $id;
+}
+else {
+	// long form response - big chunk o html
+	$type = $_REQUEST['type'];
+	echo apply_filters("async_upload_{$type}", $id);
+}
+
+?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/categories.php b/mp-wp/wp-admin/categories.php
--- a/mp-wp/wp-admin/categories.php false
+++ b/mp-wp/wp-admin/categories.php 371f8d02e7129db277beb5e47bc9bc2ebcfd2027d8361e13b2ec6e4c50ec3d307144e3a8a8b1d4731a5aee6c179201a0a59f21fccf358be59d9f0be4a77f6c5e
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Categories Management Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */
+require_once('admin.php');
+
+$title = __('Categories');
+
+wp_reset_vars( array('action', 'cat') );
+
+if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
+	$action = 'bulk-delete';
+
+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;
+break;
+
+case 'delete':
+	$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);
+
+	// 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));
+
+	wp_delete_category($cat_ID);
+
+	wp_redirect('categories.php?message=2');
+	exit;
+
+break;
+
+case 'bulk-delete':
+	check_admin_referer('bulk-categories');
+
+	if ( !current_user_can('manage_categories') )
+		wp_die( __('You are not allowed to delete categories.') );
+
+	foreach ( (array) $_GET['delete'] as $cat_ID ) {
+		$cat_name = get_catname($cat_ID);
+
+		// 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));
+
+		wp_delete_category($cat_ID);
+	}
+
+	$sendback = wp_get_referer();
+
+	wp_redirect($sendback);
+	exit();
+
+break;
+case 'edit':
+
+	$title = __('Edit Category');
+
+	require_once ('admin-header.php');
+	$cat_ID = (int) $_GET['cat_ID'];
+	$category = get_category_to_edit($cat_ID);
+	include('edit-category-form.php');
+
+break;
+
+case 'editedcat':
+	$cat_ID = (int) $_POST['cat_ID'];
+	check_admin_referer('update-category_' . $cat_ID);
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	$location = 'categories.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'categories.php') )
+			$location = $referer;
+	}
+
+	if ( wp_update_category($_POST) )
+		$location = add_query_arg('message', 3, $location);
+	else
+		$location = add_query_arg('message', 5, $location);
+
+	wp_redirect($location);
+
+	exit;
+break;
+
+default:
+
+if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+wp_enqueue_script('admin-categories');
+if ( current_user_can('manage_categories') )
+	wp_enqueue_script('inline-edit-tax');
+
+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.');
+?>
+
+<div class="wrap nosubsub">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
+
+<?php
+if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<form class="search-form topmargin" action="" method="get">
+<p class="search-box">
+	<label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
+	<input type="text" class="search-input" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+</p>
+</form>
+<br class="clear" />
+
+<div id="col-container">
+
+<div id="col-right">
+<div class="col-wrap">
+<form id="posts-filter" action="" method="get">
+<div class="tablenav">
+
+<?php
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( ! isset( $catsperpage ) || $catsperpage < 0 )
+	$catsperpage = 20;
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => ceil(wp_count_terms('category') / $catsperpage),
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-categories'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<div class="clear"></div>
+
+<table class="widefat fixed" cellspacing="0">
+	<thead>
+	<tr>
+<?php print_column_headers('categories'); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+<?php print_column_headers('categories', false); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-list" class="list:cat">
+<?php
+cat_rows(0, 0, 0, $pagenum, $catsperpage);
+?>
+	</tbody>
+</table>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<?php wp_nonce_field('bulk-categories'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+</form>
+
+<div class="form-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>
+</div>
+
+</div>
+</div><!-- /col-right -->
+
+<div id="col-left">
+<div class="col-wrap">
+
+<?php if ( current_user_can('manage_categories') ) { ?>
+<?php $category = (object) array(); $category->parent = 0; do_action('add_category_form_pre', $category); ?>
+
+<div class="form-wrap">
+<h3><?php _e('Add Category'); ?></h3>
+<div id="ajax-response"></div>
+<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">
+<input type="hidden" name="action" value="addcat" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?>
+
+<div class="form-field form-required">
+	<label for="cat_name"><?php _e('Category Name') ?></label>
+	<input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" />
+    <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p>
+</div>
+
+<div class="form-field">
+	<label for="category_nicename"><?php _e('Category Slug') ?></label>
+	<input name="category_nicename" id="category_nicename" type="text" value="" size="40" />
+    <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
+</div>
+
+<div class="form-field">
+	<label for="category_parent"><?php _e('Category Parent') ?></label>
+	<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+    <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
+</div>
+
+<div class="form-field">
+	<label for="category_description"><?php _e('Description') ?></label>
+	<textarea name="category_description" id="category_description" rows="5" cols="40"></textarea>
+    <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p>
+</div>
+
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p>
+<?php do_action('edit_category_form', $category); ?>
+</form></div>
+
+<?php } ?>
+
+</div>
+</div><!-- /col-left -->
+
+</div><!-- /col-container -->
+</div><!-- /wrap -->
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+/* ]]> */
+</script>
+
+<?php
+inline_edit_term_row('categories');
+
+break;
+}
+
+include('admin-footer.php');
+
+?>
diff -uNr a/mp-wp/wp-admin/comment.php b/mp-wp/wp-admin/comment.php
--- a/mp-wp/wp-admin/comment.php false
+++ b/mp-wp/wp-admin/comment.php 95cd3acdf8d8f8a91ce0ab861b2c93d2381569a13662bd482800ff53744488185f2d1c7371d10ba8e0d7a109447f41a094826099d0e4f6486915ffc158f812fa
@@ -0,0 +1,240 @@
+<?php
+/**
+ * Comment Management Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */
+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';
+
+/**
+ * Display error message at bottom of comments.
+ *
+ * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
+ */
+function comment_footer_die( $msg ) {  //
+	echo "<div class='wrap'><p>$msg</p></div>";
+	include('admin-footer.php');
+	die;
+}
+
+switch( $action ) {
+
+case 'editcomment' :
+	$title = __('Edit Comment');
+
+	wp_enqueue_script('comment');
+	require_once('admin-header.php');
+
+	$comment_id = absint( $_GET['c'] );
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_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) )
+		comment_footer_die( __('You are not allowed to edit comments on this post.') );
+
+	$comment = get_comment_to_edit( $comment_id );
+
+	include('edit-form-comment.php');
+
+	break;
+
+case 'cdc' :
+case 'mac' :
+
+	require_once('admin-header.php');
+
+	$comment_id = absint( $_GET['c'] );
+	$formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
+	$nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
+	$nonce_action .= $comment_id;
+
+	if ( !$comment = get_comment_to_edit( $comment_id ) )
+		comment_footer_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 ) )
+		comment_footer_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'] ) {
+	$caution_msg = __('You are about to mark the following comment as spam:');
+	$button = __('Spam Comment');
+} elseif ( 'cdc' == $action ) {
+	$caution_msg = __('You are about to delete the following comment:');
+	$button = __('Delete Comment');
+} else {
+	$caution_msg = __('You are about to approve the following comment:');
+	$button = __('Approve Comment');
+}
+?>
+
+<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
+
+<p><?php _e('Are you sure you want to do that?'); ?></p>
+
+<form action='comment.php' method='get'>
+
+<table width="100%">
+<tr>
+<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></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="form-table" 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"><?php echo _c('Comment|noun'); ?></th>
+<td><?php echo $comment->comment_content; ?></td>
+</tr>
+</table>
+
+</div>
+</div>
+<?php
+	break;
+
+case 'deletecomment' :
+	$comment_id = absint( $_REQUEST['c'] );
+	check_admin_referer( 'delete-comment_' . $comment_id );
+
+	if ( isset( $_REQUEST['noredir'] ) )
+		$noredir = true;
+	else
+		$noredir = false;
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_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 ) )
+		comment_footer_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 && false === strpos(wp_get_referer(), 'comment.php' ) )
+		wp_redirect( wp_get_referer() );
+	else if ( '' != wp_get_original_referer() && false == $noredir )
+		wp_redirect( wp_get_original_referer() );
+	else
+		wp_redirect( admin_url('edit-comments.php') );
+
+	die;
+	break;
+
+case 'unapprovecomment' :
+	$comment_id = absint( $_GET['c'] );
+	check_admin_referer( 'unapprove-comment_' . $comment_id );
+
+	if ( isset( $_GET['noredir'] ) )
+		$noredir = true;
+	else
+		$noredir = false;
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_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 ) )
+		comment_footer_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( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
+
+	exit();
+	break;
+
+case 'approvecomment' :
+	$comment_id = absint( $_GET['c'] );
+	check_admin_referer( 'approve-comment_' . $comment_id );
+
+	if ( isset( $_GET['noredir'] ) )
+		$noredir = true;
+	else
+		$noredir = false;
+
+	if ( !$comment = get_comment( $comment_id ) )
+		comment_footer_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) )
+		comment_footer_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 ( '' != wp_get_referer() && false == $noredir )
+		wp_redirect( wp_get_referer() );
+	else
+		wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
+
+	exit();
+	break;
+
+case 'editedcomment' :
+
+	$comment_id = absint( $_POST['comment_ID'] );
+	$comment_post_id = absint( $_POST['comment_post_id'] );
+
+	check_admin_referer( 'update-comment_' . $comment_id );
+
+	edit_comment();
+
+	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+	wp_redirect( $location );
+
+	exit();
+	break;
+
+default:
+	wp_die( __('Unknown action.') );
+	break;
+
+} // end switch
+
+include('admin-footer.php');
+
+?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/css/colors-classic-rtl.css b/mp-wp/wp-admin/css/colors-classic-rtl.css
--- a/mp-wp/wp-admin/css/colors-classic-rtl.css false
+++ b/mp-wp/wp-admin/css/colors-classic-rtl.css b83bbc4746dffa9f00479a0a0bc1d93bfc96b084abc3f84f3329c44a06ea6d25e198e94ff714f31dd276db1943e80aac371ba649062698f45e3ae2746db107d8
@@ -0,0 +1,80 @@
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg-rtl.gif);
+}
+.tablenav .tablenav-pages a {
+	background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px;
+}
+#upload-menu li.current {
+	border-right-color: transparent;
+	border-left-color: #448abd;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: url(../images/menu-bits-rtl.gif) top right repeat-x;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px;
+}
+
+#adminmenu a.wp-has-submenu {
+	background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px;
+}
+
+#adminmenu li.current a,
+#adminmenu .wp-submenu a:hover {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px;
+}
diff -uNr a/mp-wp/wp-admin/css/colors-classic.css b/mp-wp/wp-admin/css/colors-classic.css
--- a/mp-wp/wp-admin/css/colors-classic.css false
+++ b/mp-wp/wp-admin/css/colors-classic.css b7990dd10be7b232cc07c5fc335b8a30dd801c22aa9782a1c3eb479a5ba36b7fff0c72f1da096e20b45ff045422a108daf1801e347cbabc57d60711597cc49fc
@@ -0,0 +1,1577 @@
+html {
+	background-color: #F5FCFD;
+}
+
+.find-box-search {
+	border-color: #dfdfdf;
+	background-color: #f1f1f1;
+}
+
+.find-box {
+	background-color: #f1f1f1;
+}
+
+.find-box-inside {
+	background-color: #fff;
+}
+
+a.page-numbers:hover {
+	border-color: #999;
+}
+
+body,
+#wpbody,
+.form-table .pre {
+	color: #333;
+}
+
+body > #upload-menu {
+	border-bottom-color: #fff;
+}
+
+kbd, code {
+	background: #eaeaea;
+}
+
+div#current-widgets,
+#postcustomstuff table,
+#your-profile fieldset,
+#rightnow,
+div.dashboard-widget,
+#dashboard-widgets p.dashboard-widget-links,
+#replyrow #ed_reply_toolbar input {
+	border-color: #ccc;
+}
+
+#poststuff .inside label.spam {
+	color: red;
+}
+
+#poststuff .inside label.waiting {
+	color: orange;
+}
+
+#poststuff .inside label.approved {
+	color: green;
+}
+
+#postcustomstuff table {
+	border-color: #dfdfdf;
+	background-color: #F9F9F9;
+}
+
+#postcustomstuff thead th {
+	background-color: #F1F1F1;
+}
+
+#postcustomstuff table input,
+#postcustomstuff table textarea {
+	border-color: #dfdfdf;
+	background-color: #fff;
+}
+
+.widefat {
+	border-color: #BBD8E7;
+	background-color: #fff;
+}
+
+div.dashboard-widget-error {
+	background-color: #c43;
+}
+
+div.dashboard-widget-notice {
+	background-color: #cfe1ef;
+}
+
+div.dashboard-widget-submit,
+ul.widget-control-list div.widget-control-actions {
+	border-top-color: #ccc;
+}
+
+div.ui-tabs-panel {
+	border-color: #f1f1f1;
+}
+
+ul#category-tabs li.ui-tabs-selected {
+	background-color: #f1f1f1;
+}
+
+input.disabled,
+textarea.disabled {
+	background-color: #ccc;
+}
+/* #upload-menu li a.upload-tab-link, */
+li.widget-list-control-item h4.widget-title a:hover,
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited,
+.login #backtoblog a:hover,
+#plugin-information .action-button a,
+#plugin-information .action-button a:hover,
+#plugin-information .action-button a:visited {
+	color: #fff;
+}
+
+li.widget-list-control-item div.widget-control {
+	background-color: #fff;
+	border-color: #dfdfdf;
+}
+
+.metabox-holder .postbox h3,
+#poststuff .postbox h3,
+#poststuff .stuffbox h3 {
+	background: #dfdfdf url("../images/blue-grad.png.svg") repeat-x left top;
+	text-shadow: #fff 0 1px 0;
+}
+
+.form-table th,
+.form-wrap label {
+	color: #222;
+	text-shadow: #fff 0 1px 0;
+}
+
+.setting-description, .form-wrap p {
+	color: #666;
+}
+
+select {
+	background-color: #fff;
+	border-color: #8CBDD5;
+}
+
+strong .post-com-count span {
+	background-color: #21759b;
+}
+
+ul#widget-list li.widget-list-item h4.widget-title {
+	background-color: #f0f0f0;
+	color: #000;
+}
+
+.sorthelper {
+	background-color: #ccf3fa;
+}
+
+.ac_match, .subsubsub a.current {
+	color: #000;
+}
+
+.wrap h2 {
+	color: #093E56;
+}
+
+.ac_over {
+	background-color: #f0f0b8;
+}
+
+.ac_results {
+	background-color: #fff;
+	border-color: #808080;
+}
+
+.ac_results li {
+	color: #101010;
+}
+
+.alternate, .alt {
+	background-color: #EDFBFC;
+}
+
+.available-theme a.screenshot {
+	background-color: #f1f1f1;
+	border-color: #ddd;
+}
+
+.bar {
+	background-color: #e8e8e8;
+	border-right-color: #99d;
+}
+
+#media-upload {
+	background: #fff;
+}
+#media-upload .slidetoggle {
+	border-top-color: #dfdfdf;
+}
+
+.error, #login #login_error {
+	background-color: #ffebe8;
+	border-color: #c00;
+}
+
+.error a {
+	color: #c00;
+}
+
+.form-invalid {
+	background-color: #ffebe8 !important;
+}
+
+.form-invalid input {
+	border-color: #c00 !important;
+}
+
+.form-table input,
+.form-table textarea,
+.search-input,
+.form-field input,
+.form-field textarea,
+.submit {
+	border-color: #8CBDD5;
+}
+
+.highlight {
+	background-color: #e4f2fd;
+	color: #d54e21;
+}
+
+.howto,
+.nonessential,
+#edit-slug-box,
+.form-input-tip,
+.rss-widget span.rss-date,
+.subsubsub {
+	color: #666;
+}
+
+.media-item {
+	border-bottom-color: #dfdfdf;
+}
+
+#wpbody-content #media-items .describe {
+	border-top-color: #dfdfdf;
+}
+
+.describe input[type="text"],
+.describe textarea {
+	border-color: #dfdfdf;
+}
+
+.media-upload-form label.form-help,
+td.help {
+	color: #9a9a9a;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg.gif.svg);
+	color: #fff;
+}
+
+.post-com-count span {
+	background-color: #bbb;
+	color: #fff;
+}
+
+.post-com-count:hover span {
+	background-color: #d54e21;
+}
+
+.quicktags, .search {
+	background-color: #ccc;
+	color: #000;
+}
+
+.side-info h5, .bordertitle {
+	border-bottom-color: #dadada;
+}
+
+.side-info ul, .widget-description {
+	color: #666;
+}
+
+.button,
+.button-secondary,
+.submit input,
+input[type=button],
+input[type=submit] {
+	border-color: #8CBDD5;
+	color: #093E56;
+}
+
+.button:hover,
+.button-secondary:hover,
+.submit input:hover,
+input[type=button]:hover,
+input[type=submit]:hover {
+	color: #000;
+	border-color: #21759B;
+}
+
+.button,
+.submit input,
+.button-secondary {
+	background: #f2f2f2 url(../images/white-grad.png.svg) repeat-x scroll left top;
+}
+
+.button:active,
+.submit input:active,
+.button-secondary:active {
+	background: #eee url(../images/white-grad-active.png.svg) repeat-x scroll left top;
+}
+
+.button-primary,
+.submit .button-primary,
+#login form .submit input {
+	border-color: #298cba !important;
+	font-weight: bold;
+	color: #FFF !important;
+	background: #21759B url(../images/button-grad.png.svg) repeat-x scroll left top;
+}
+
+.button-primary:active,
+#login form .submit input:active {
+	background: #21759b url(../images/button-grad-active.png.svg) repeat-x scroll left top !important;
+}
+
+.button[disabled],
+.button:disabled,
+.button-secondary[disabled],
+.button-secondary:disabled,
+a.button.disabled {
+	color: #ccc !important;
+	border-color: #ccc;
+}
+
+.button-primary[disabled],
+.button-primary:disabled {
+	color: #2fa0d5 !important;
+}
+
+a:active,
+a:focus {
+	color: #d54e21;
+}
+
+a:hover,
+#wphead #viewsite a:hover,
+#adminmenu a:hover,
+#adminmenu ul.wp-submenu a:hover,
+#the-comment-list .comment a:hover,
+#rightnow a:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover,
+#login form .submit input:hover,
+div.dashboard-widget-submit input:hover,
+#media-upload a.del-link:hover,
+.ui-tabs-nav a:hover {
+	color: #d54e21;
+}
+
+#the-comment-list .comment-item,
+#dashboard-widgets #dashboard_quick_press form p.submit {
+	border-color: #dfdfdf;
+}
+
+.button-primary:hover,
+#login form .submit input:hover {
+	border-color: #13455b !important;
+	color: #EAF2FA !important;
+}
+
+#side-info-column #category-tabs .ui-tabs-selected a {
+	color: #333;
+}
+
+#rightnow .rbutton {
+	background-color: #ebebeb;
+	color: #264761;
+}
+
+.submitbox .submit {
+	background-color: #464646;
+	color: #ccc;
+}
+
+.submitbox .submitdelete, a.delete {
+	color: #f00;
+	border-bottom-color: #f00;
+}
+
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
+	color: #fff;
+	background-color: #f00;
+	border-bottom-color: #f00;
+}
+
+#normal-sortables .submitbox .submitdelete:hover {
+	color: #000;
+	background-color: #f00;
+	border-bottom-color: #f00;
+}
+
+.tablenav .dots {
+	border-color: transparent;
+}
+
+.tablenav .next,
+.tablenav .prev {
+	border-color: transparent;
+	color: #21759b;
+}
+
+.tablenav .next:hover,
+.tablenav .prev:hover {
+	border-color: transparent;
+	color: #d54e21;
+}
+
+.updated,
+.login #login_error,
+.login .message {
+	background-color: #ffffe0;
+	border-color: #e6db55;
+}
+
+a.page-numbers {
+	border-bottom-color: #B8D3E2;
+}
+
+div#available-widgets-filter,
+ul#widget-list li.widget-list-item,
+.commentlist li {
+	border-bottom-color: #ccc;
+}
+
+.widefat td,
+.widefat th {
+	border-bottom-color: #BBD8E7;
+}
+
+.widefat th {
+	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
+}
+
+.widefat thead tr th,
+.widefat tfoot tr th,
+h3.dashboard-widget-title,
+h3.dashboard-widget-title span,
+h3.dashboard-widget-title small,
+.find-box-head {
+	color: #333;
+	background: #dfdfdf url(../images/blue-grad.png.svg) repeat-x scroll left top;
+}
+
+h3.dashboard-widget-title small a {
+	color: #d7d7d7;
+}
+
+h3.dashboard-widget-title small a:hover {
+	color: #fff;
+}
+
+#adminmenu a,
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML,
+#the-comment-list p.comment-author strong a,
+#media-upload a.del-link,
+#media-upload a.delete,
+.ui-tabs-nav a, a {
+	color: #1C6280;
+}
+
+/* Because we don't want visited on these links */
+body.press-this .ui-tabs-selected a,
+body.press-this .ui-tabs-selected a:hover {
+	background-color: #fff;
+	border-color: #c6d9e9;
+	border-bottom-color: #fff;
+	color: #d54e21;
+}
+
+#adminmenu #awaiting-mod,
+#adminmenu .update-plugins,
+#sidemenu a .update-plugins,
+#rightnow .reallynow,
+#plugin-information .action-button {
+	background-color: #d54e21;
+	color: #fff;
+}
+
+#adminmenu li a:hover #awaiting-mod,
+#adminmenu li a:hover .update-plugins,
+#sidemenu li a:hover .update-plugins {
+	background-color: #264761;
+	color: #fff;
+}
+
+#adminmenu li.current a #awaiting-mod,
+#adminmenu li.current a .update-plugins,
+#adminmenu li.wp-has-current-submenu a .update-plugins,
+#adminmenu li.wp-has-current-submenu a .update-plugins {
+	background-color: #ddd;
+	color: #000;
+	text-shadow: none;
+	-moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	-khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	-webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+}
+
+#adminmenu li.current a:hover #awaiting-mod,
+#adminmenu li.current a:hover .update-plugins,
+#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
+#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
+	background-color: #264761;
+	color: #fff;
+}
+
+div#media-upload-header {
+	background-color: #f9f9f9;
+	border-bottom-color: #dfdfdf;
+}
+
+div#plugin-information-header {
+	background-color: #e4f2fd;
+	border-bottom-color: #c6d9e9;
+}
+
+#currenttheme img {
+	border-color: #666;
+}
+
+#current-widgets .drop-widget-here {
+	background-color: #ffc;
+}
+
+#dashboard_secondary div.dashboard-widget-content ul li a {
+	background-color: #f9f9f9;
+}
+
+input.readonly, textarea.readonly {
+	background-color: #ddd;
+}
+
+#dragHelper h4.widget-title,
+li.widget-list-control-item h4,
+#dragHelper li.widget-list-control-item h4 {
+	background-color: #2683ae;
+	color: #fff;
+}
+
+#ed_toolbar input,
+#ed_reply_toolbar input {
+	background: #fff url("../images/fade-butt.png.svg") repeat-x 0 -2px;
+}
+
+#editable-post-name {
+	background-color: #fffbcc;
+}
+
+#edit-slug-box strong,
+.tablenav .displaying-num,
+#submitted-on {
+	color: #777;
+}
+
+.login #nav a {
+	color: #21759b !important;
+}
+
+.login #nav a:hover {
+	color: #d54e21 !important;
+}
+
+#footer,
+#footer-upgrade {
+	background: #073447;
+	color: #999;
+}
+
+#media-items {
+	border-color: #dfdfdf;
+}
+
+#pass-strength-result {
+	background-color: #eee;
+	border-color: #ddd !important;
+}
+
+#pass-strength-result.bad {
+	background-color: #ffb78c;
+	border-color: #ff853c !important;
+}
+
+#pass-strength-result.good {
+	background-color: #ffec8b;
+	border-color: #fc0 !important;
+}
+
+#pass-strength-result.short {
+	background-color: #ffa0a0;
+	border-color: #f04040 !important;
+}
+
+#pass-strength-result.strong {
+	background-color: #c3ff88;
+	border-color: #8dff1c !important;
+}
+
+.checkbox,
+.side-info,
+#your-profile #rich_editing {
+	background-color: #fff;
+}
+
+.plugins .active {
+	background-color: #e7f7d3;
+}
+
+.plugins .togl {
+	border-right-color: #ccc;
+}
+
+#the-comment-list .unapproved {
+	background-color: #ffffe0;
+}
+
+#the-comment-list .approve a {
+	color: #006505;
+}
+
+#the-comment-list .unapprove a {
+	color: #d98500;
+}
+
+#the-comment-list .delete a {
+	color: #bc0b0b;
+}
+
+.plugins tr {
+	background-color: #fff;
+}
+
+.metabox-holder .postbox,
+#poststuff .postbox,
+#titlediv,
+#poststuff .postarea,
+#poststuff .stuffbox,
+.postbox input[type="text"],
+.postbox textarea,
+.stuffbox input[type="text"],
+.stuffbox textarea {
+	border-color: #BBD8E7;
+}
+
+.metabox-holder .postbox,
+#poststuff .postbox {
+	background-color: #FFF;
+}
+
+.ui-sortable .postbox h3 {
+	color: #093E56;
+}
+
+.ui-sortable .postbox h3:hover {
+	color: #000;
+}
+
+.curtime #timestamp {
+	background-image: url(../images/date-button.gif.svg);
+}
+
+#quicktags #ed_link {
+	color: #00f;
+}
+
+#rightnow .youhave {
+	background-color: #f0f6fb;
+}
+
+#rightnow a {
+	color: #448abd;
+}
+
+#tagchecklist span a,
+#bulk-titles div a {
+	background: url(../images/xit.gif.svg) no-repeat;
+}
+
+#tagchecklist span a:hover,
+#bulk-titles div a:hover {
+	background: url(../images/xit.gif.svg) no-repeat -10px 0;
+}
+
+#update-nag, .plugin-update {
+	background-color: #fffeeb;
+	border-bottom-color: #ccc;
+	border-top-color: #ccc;
+	color: #555;
+}
+
+.login #backtoblog a {
+	color: #ccc;
+}
+
+#wphead {
+	background-color: #073447;
+}
+
+body.login {
+	border-top-color: #093E56;
+}
+
+#wphead h1 a {
+	color: #fff;
+}
+
+#login form input {
+	color: #555;
+}
+
+#wphead h1 a:hover {
+	text-decoration: underline;
+}
+
+#user_info {
+	color: #999;
+}
+
+#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
+	color: #ccc;
+	text-decoration: none;
+}
+
+#user_info a:hover, #footer a:hover {
+	color: #fff;
+	text-decoration: underline !important;
+}
+
+#user_info a:active, #footer a:active {
+	color: #ccc !important;
+}
+
+div#media-upload-error,
+.file-error,
+abbr.required,
+.widget-control-remove:hover,
+.delete a:hover {
+	color: #f00;
+}
+
+#media-upload a.delete {
+	color: #888;
+}
+
+/* editors */
+#quicktags {
+	border-color: #dfdfdf;
+	background-color: #dfdfdf;
+}
+
+#ed_toolbar input {
+	border-color: #C3C3C3;
+}
+
+#ed_toolbar input:hover {
+	border-color: #aaa;
+	background: #ddd;
+}
+
+#poststuff .wp_themeSkin .mceStatusbar {
+	border-color: #EDEDED;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	background-color: #f1f1f1;
+	border-color: #dfdfdf;
+	color: #999;
+}
+
+#poststuff #editor-toolbar .active {
+	border-bottom-color: #e9e9e9;
+	background-color: #e9e9e9;
+	color: #333;
+}
+
+/* TinyMCE */
+#post-status-info {
+	background-color: #EDEDED;
+}
+
+.wp_themeSkin *,
+.wp_themeSkin a:hover,
+.wp_themeSkin a:link,
+.wp_themeSkin a:visited,
+.wp_themeSkin a:active {
+	 color: #000;
+}
+
+/* Containers */
+.wp_themeSkin iframe {
+	background: #fff;
+}
+
+/* Layout */
+.wp_themeSkin .mceStatusbar {
+	color: #000;
+	background-color: #f5f5f5;
+}
+
+/* Button */
+.wp_themeSkin .mceButton {
+	background-color: #e9e8e8;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin a.mceButtonEnabled:hover,
+.wp_themeSkin a.mceButtonActive,
+.wp_themeSkin a.mceButtonSelected {
+	background-color: #d5d5d5;
+	border-color: #777 !important;
+}
+
+.wp_themeSkin .mceButtonDisabled {
+	border-color: #ccc !important;
+}
+
+/* ListBox */
+.wp_themeSkin .mceListBox .mceText,
+.wp_themeSkin .mceListBox .mceOpen  {
+	border-color: #B2B2B2;
+	background-color: #d5d5d5;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
+.wp_themeSkin .mceListBoxHover .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceText {
+	border-color: #777 !important;
+	background-color: #d5d5d5;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
+.wp_themeSkin .mceListBoxHover .mceText {
+	border-color: #777 !important;
+}
+
+.wp_themeSkin select.mceListBox {
+	border-color: #B2B2B2;
+	background-color: #fff;
+}
+
+/* SplitButton */
+.wp_themeSkin .mceSplitButton a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceOpen {
+	background-color: #e8e8e8;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceSplitButton a.mceOpen:hover,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceAction:hover {
+	background-color: #d5d5d5;
+	border-color: #777 !important;
+}
+
+.wp_themeSkin .mceSplitButtonActive {
+	background-color: #B2B2B2;
+}
+
+/* ColorSplitButton */
+.wp_themeSkin div.mceColorSplitMenu table {
+	background-color: #ebebeb;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceColorSplitMenu a {
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
+	border-color: #fff;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
+	border-color: #0A246A;
+	background-color: #B6BDD2;
+}
+
+.wp_themeSkin a.mceMoreColors:hover {
+	border-color: #0A246A;
+}
+
+/* Menu */
+.wp_themeSkin .mceMenu {
+	border-color: #ddd;
+}
+
+.wp_themeSkin .mceMenu table {
+	background-color: #ebeaeb;
+}
+
+.wp_themeSkin .mceMenu .mceText {
+	color: #000;
+}
+
+.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
+.wp_themeSkin .mceMenu .mceMenuItemActive {
+	background-color: #f5f5f5;
+}
+.wp_themeSkin td.mceMenuItemSeparator {
+	background-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle a {
+	background-color: #ccc;
+	border-bottom-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle span.mceText {
+	color: #000;
+}
+.wp_themeSkin .mceMenuItemDisabled .mceText {
+	color: #888;
+}
+
+.wp_themeSkin tr.mceFirst td.mceToolbar {
+	background-color: #dfdfdf;
+	border-color: #dfdfdf;
+}
+
+.wp-admin #mceModalBlocker {
+	background: #000;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft {
+	background: #444444;
+	border-left: 1px solid #999;
+	border-top: 1px solid #999;
+	-moz-border-radius: 4px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-khtml-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight {
+	background: #444444;
+	border-right: 1px solid #999;
+	border-top: 1px solid #999;
+	border-top-right-radius: 4px;
+	-khtml-border-top-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius: 0 4px 0 0;
+}
+
+.wp-admin .clearlooks2 .mceMiddle .mceLeft {
+	background: #f1f1f1;
+	border-left: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceMiddle .mceRight {
+	background: #f1f1f1;
+	border-right: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceLeft {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+	border-left: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceCenter {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceRight {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+	border-right: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop span {
+	color: #e5e5e5;
+}
+/* end TinyMCE */
+
+#editorcontainer,
+#post-status-info,
+#titlediv #title {
+	border-color: #dfdfdf;
+}
+
+#titlediv #title {
+	background-color: #fff;
+}
+
+#tTips p#tTips_inside {
+	background-color: #ddd;
+	color: #333;
+}
+
+#timestampdiv input,
+#namediv input,
+#tagsdiv #the-tagcloud {
+	border-color: #ddd;
+}
+
+/* menu */
+#adminmenu * {
+	border-color: #BBD8E7;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif.svg) no-repeat scroll left 5px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif.svg) no-repeat scroll right -34px;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -109px;
+}
+
+#adminmenu a.menu-top {
+	background: #EAF3FA url(../images/menu-bits.gif.svg) repeat-x scroll left -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #FFFFFF url(../images/menu-bits.gif.svg) no-repeat scroll 0 -310px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a {
+	background: none;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark.gif.svg) top left no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: #6d6d6d url(../images/menu-bits.gif.svg) top left repeat-x;
+	border-color: #6d6d6d;
+	color: #fff;
+	text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-submenu,
+#adminmenu li.wp-has-current-submenu ul li a {
+	border-color: #aaa !important;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark.gif.svg) bottom left no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu ul {
+	border-bottom-color: #aaa;
+}
+
+#adminmenu li.menu-top .current:hover {
+	border-color: #B5B5B5;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll  0 -289px;
+}
+
+#adminmenu .wp-submenu a:hover {
+	background-color: #EAF2FA !important;
+	color: #333 !important;
+}
+
+#adminmenu .wp-submenu li.current,
+#adminmenu .wp-submenu li.current a,
+#adminmenu .wp-submenu li.current a:hover {
+	color: #333;
+	background-color: #f5f5f5;
+	background-image: none;
+	border-color: #e3e3e3;
+	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
+}
+
+#adminmenu .wp-submenu ul {
+	background-color: #fff;
+}
+
+.folded #adminmenu li.menu-top,
+#adminmenu .wp-submenu .wp-submenu-head {
+	background-color: #EAF2FA;
+}
+
+.folded #adminmenu li.wp-has-current-submenu,
+.folded #adminmenu li.menu-top.current {
+	background-color: #BBD8E7;
+}
+
+#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
+	background-color: #BBD8E7;
+	border-color: #8CBDD5;
+}
+
+#adminmenu div.wp-submenu {
+	background-color: transparent;
+}
+
+/* menu icons */
+#adminmenu #menu-dashboard div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -61px -33px;
+}
+
+#adminmenu #menu-dashboard:hover div.wp-menu-image,
+#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
+#adminmenu  #menu-dashboard.current div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -61px -1px;
+}
+
+#adminmenu #menu-posts div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -272px -33px;
+}
+
+#adminmenu #menu-posts:hover div.wp-menu-image,
+#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -272px -1px;
+}
+
+#adminmenu #menu-media div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -121px -33px;
+}
+
+#adminmenu #menu-media:hover div.wp-menu-image,
+#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -121px -1px;
+}
+
+#adminmenu #menu-links div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -91px -33px;
+}
+
+#adminmenu #menu-links:hover div.wp-menu-image,
+#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -91px -1px;
+}
+
+#adminmenu #menu-pages div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -151px -33px;
+}
+
+#adminmenu #menu-pages:hover div.wp-menu-image,
+#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -1px;
+}
+
+#adminmenu #menu-comments div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -31px -33px;
+}
+
+#adminmenu #menu-comments:hover div.wp-menu-image,
+#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
+#adminmenu #menu-comments.current div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -31px -1px;
+}
+
+#adminmenu #menu-appearance div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -33px;
+}
+
+#adminmenu #menu-appearance:hover div.wp-menu-image,
+#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -1px -1px;
+}
+
+#adminmenu #menu-plugins div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -181px -33px;
+}
+
+#adminmenu #menu-plugins:hover div.wp-menu-image,
+#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -1px;
+}
+
+#adminmenu #menu-users div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -301px -33px;
+}
+
+#adminmenu #menu-users:hover div.wp-menu-image,
+#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -301px -1px;
+}
+
+#adminmenu #menu-tools div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -33px;
+}
+
+#adminmenu #menu-tools:hover div.wp-menu-image,
+#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -211px -1px;
+}
+
+#adminmenu #menu-settings div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -241px -33px;
+}
+
+#adminmenu #menu-settings:hover div.wp-menu-image,
+#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu-vs.png.svg") no-repeat scroll -241px -1px;
+}
+/* end menu */
+
+
+/* Diff */
+table.diff .diff-deletedline {
+	background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+	background-color: #ff9999;
+}
+table.diff .diff-addedline {
+	background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+	background-color: #99ff99;
+}
+
+#att-info {
+	background-color: #E4F2FD;
+}
+
+/* edit image */
+#sidemenu a {
+	background-color: #f9f9f9;
+	border-color: #f9f9f9;
+	border-bottom-color: #dfdfdf;
+}
+
+#sidemenu a.current {
+	background-color: #fff;
+	border-color: #dfdfdf #dfdfdf #fff;
+	color: #D54E21;
+}
+
+
+#screen-options-wrap,
+#contextual-help-wrap {
+	background-color: #f1f1f1;
+	border-color: #dfdfdf;
+}
+
+#screen-meta-links a.show-settings {
+	color: #606060;
+}
+
+#screen-meta-links a.show-settings:hover {
+	color: #000;
+}
+
+#replysubmit {
+	background-color: #f1f1f1;
+	border-top-color: #ddd;
+}
+
+#replyerror {
+	border-color: #ddd;
+	background-color: #f9f9f9;
+}
+
+#edithead,
+#replyhead {
+	background-color: #f1f1f1;
+}
+
+#ed_reply_toolbar {
+	background-color: #e9e9e9;
+}
+
+/* table vim shortcuts */
+.vim-current {
+	background-color: #E4F2FD !important;
+}
+
+/* Install Plugins */
+.star-average,
+.star.star-rating {
+	background-color: #fc0;
+}
+
+div.star.select:hover {
+	background-color: #d00;
+}
+
+#plugin-information .fyi ul {
+	background-color: #eaf3fa;
+}
+
+#plugin-information .fyi h2.mainheader {
+	background-color: #cee1ef;
+}
+
+#plugin-information pre,
+#plugin-information code {
+	background-color: #ededff;
+}
+
+#plugin-information pre {
+	border: 1px solid #ccc;
+}
+
+/* inline editor */
+.inline-edit-row fieldset input[type="text"],
+.inline-edit-row fieldset textarea,
+#bulk-titles,
+#replyrow input {
+	border-color: #ddd;
+}
+
+.inline-editor div.title {
+	background-color: #EAF3FA;
+}
+
+.inline-editor ul.cat-checklist {
+	background-color: #FFFFFF;
+	border-color: #ddd;
+}
+
+.inline-edit-row p.submit {
+	background-color: #f1f1f1;
+}
+
+.inline-editor .categories .catshow,
+.inline-editor .categories .cathide {
+	color: #21759b;
+}
+
+.inline-editor .quick-edit-save {
+	background-color: #f1f1f1;
+}
+
+#replyrow #ed_reply_toolbar input:hover {
+	border-color: #aaa;
+	background: #ddd;
+}
+
+fieldset.inline-edit-col-right .inline-edit-col {
+	border-color: #dfdfdf;
+}
+
+.attention {
+	color: #D54E21;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -111px;
+}
+
+#major-publishing-actions {
+	background: #eaf2fa;
+}
+
+.tablenav .tablenav-pages {
+	color: #555;
+}
+
+.tablenav .tablenav-pages a {
+	border-color: #e3e3e3;
+	background: #eee url('../images/menu-bits.gif.svg') repeat-x scroll left -379px;
+}
+
+.tablenav .tablenav-pages a:hover {
+	color: #d54e21;
+	border-color: #d54321;
+}
+
+.tablenav .tablenav-pages a:active {
+	color: #fff !important;
+}
+
+.tablenav .tablenav-pages .current {
+	background: #dfdfdf;
+	border-color: #d3d3d3;
+}
+
+#availablethemes,
+#availablethemes td {
+	border-color: #ddd;
+}
+
+#current-theme img {
+	border-color: #999;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link,
+#TB_window #TB_title a.tb-theme-preview-link:visited {
+	color: #999;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link:hover,
+#TB_window #TB_title a.tb-theme-preview-link:focus {
+	color: #ccc;
+}
+
+.misc-pub-section {
+	border-bottom-color: #eee;
+}
+
+#minor-publishing {
+	border-bottom-color: #ddd;
+}
+
+#post-body .misc-pub-section {
+	border-right-color: #eee;
+}
+
+.post-com-count span {
+	background-color: #bbb;
+}
+
+.form-table .color-palette td {
+	border-color: #fff;
+}
+
+.sortable-placeholder {
+	border-color: #bbb;
+	background-color: #f5f5f5;
+}
+
+#post-body ul#category-tabs li.ui-tabs-selected a {
+	color: #333;
+}
+
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
+	border-color: #999;
+	background-color: #eee;
+}
+
+#wp_editimgbtn:hover,
+#wp_delimgbtn:hover,
+#wp_editgallery:hover,
+#wp_delgallery:hover {
+	border-color: #555;
+	background-color: #ccc;
+}
+
+#favorite-first {
+	background: #797979 url(../images/fav.png.svg) repeat-x 0 center;
+	border-color: #777 !important;
+	border-bottom-color: #666 !important;
+}
+
+#favorite-inside {
+	border-color: #797979;
+	background-color: #797979;
+}
+
+#favorite-toggle {
+	background: transparent url(../images/fav-arrow.gif.svg) no-repeat 0 -4px;
+}
+
+#favorite-actions a {
+	color: #ddd;
+}
+
+#favorite-actions a:hover {
+	color: #fff;
+}
+
+#favorite-inside a:hover {
+	text-decoration: underline;
+}
+
+#favorite-actions .slide-down {
+	border-bottom-color: #626262;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+.button-primary,
+.submit .button-primary {
+	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
+}
+
+#screen-meta a.show-settings {
+	background-color: transparent;
+	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
+}
+
+#icon-edit,
+#icon-post {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -552px -5px;
+}
+
+#icon-index {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -137px -5px;
+}
+
+#icon-upload {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -251px -5px;
+}
+
+#icon-link-manager,
+#icon-link,
+#icon-link-category {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -190px -5px;
+}
+
+#icon-edit-pages,
+#icon-page {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -312px -5px;
+}
+
+#icon-edit-comments {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -72px -5px;
+}
+
+#icon-themes {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -11px -5px;
+}
+
+#icon-plugins {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -370px -5px;
+}
+
+#icon-users,
+#icon-user-edit {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -600px -5px;
+}
+
+#icon-tools,
+#icon-admin {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -432px -5px;
+}
+
+#icon-options-general {
+	background: transparent url(../images/icons32-vs.png.svg) no-repeat -492px -5px;
+}
+
+.view-switch #view-switch-list {
+	background: transparent url(../images/list-vs.png.svg) no-repeat 0 0;
+}
+
+.view-switch #view-switch-list.current {
+	background: transparent url(../images/list-vs.png.svg) no-repeat -40px 0;
+}
+
+.view-switch #view-switch-excerpt {
+	background: transparent url(../images/list-vs.png.svg) no-repeat -20px 0;
+}
+
+.view-switch #view-switch-excerpt.current {
+	background: transparent url(../images/list-vs.png.svg) no-repeat -60px 0;
+}
+
+#header-logo {
+	background: transparent url(../images/wp-logo.gif.svg) no-repeat scroll center center;
+}
diff -uNr a/mp-wp/wp-admin/css/colors-fresh-rtl.css b/mp-wp/wp-admin/css/colors-fresh-rtl.css
--- a/mp-wp/wp-admin/css/colors-fresh-rtl.css false
+++ b/mp-wp/wp-admin/css/colors-fresh-rtl.css 720a9833709c0b073768ae1ddf43af801456f0d14acae75efb856e1bd840aa3ca5582f320de64f925103de6519248334a3e5a820f002dbb891e15f9ff4f36f0a
@@ -0,0 +1,83 @@
+.bar {
+	border-right-color: transparent;
+	border-left-color: #99d;
+}
+
+.plugins .togl {
+	border-right-color: transparent;
+	border-left-color: #ccc;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg-rtl.gif);
+}
+.tablenav .tablenav-pages a {
+	background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px;
+}
+#upload-menu li.current {
+	border-right-color: transparent;
+	border-left-color: #448abd;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark-rtl.gif) top right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: url(../images/menu-bits-rtl.gif) top right repeat-x;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px;
+}
+
+#adminmenu a.wp-has-submenu {
+	background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px;
+}
+
+#adminmenu li.current a,
+#adminmenu .wp-submenu a:hover {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll  right -289px;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px;
+}
+#favorite-toggle {
+	background: transparent url(../images/fav-arrow-rtl.gif) no-repeat right -4px;
+}
diff -uNr a/mp-wp/wp-admin/css/colors-fresh.css b/mp-wp/wp-admin/css/colors-fresh.css
--- a/mp-wp/wp-admin/css/colors-fresh.css false
+++ b/mp-wp/wp-admin/css/colors-fresh.css 9513d5753b9c8ca3f4117f59d71b041bb886aee60b14cb9ce16ca76b9781fd602e5407f21963ee9c87723b3e09456494f977bbba059c733d6dbc0d3bf47d4113
@@ -0,0 +1,1577 @@
+html {
+	background-color: #f9f9f9;
+}
+
+.find-box-search {
+	border-color: #dfdfdf;
+	background-color: #f1f1f1;
+}
+
+.find-box {
+	background-color: #f1f1f1;
+}
+
+.find-box-inside {
+	background-color: #fff;
+}
+
+a.page-numbers:hover {
+	border-color: #999;
+}
+
+body,
+#wpbody,
+.form-table .pre {
+	color: #333;
+}
+
+body > #upload-menu {
+	border-bottom-color: #fff;
+}
+
+kbd, code {
+	background: #eaeaea;
+}
+
+div#current-widgets,
+#postcustomstuff table,
+#your-profile fieldset,
+#rightnow,
+div.dashboard-widget,
+#dashboard-widgets p.dashboard-widget-links,
+#replyrow #ed_reply_toolbar input {
+	border-color: #ccc;
+}
+
+#poststuff .inside label.spam {
+	color: red;
+}
+
+#poststuff .inside label.waiting {
+	color: orange;
+}
+
+#poststuff .inside label.approved {
+	color: green;
+}
+
+#postcustomstuff table {
+	border-color: #dfdfdf;
+	background-color: #F9F9F9;
+}
+
+#postcustomstuff thead th {
+	background-color: #F1F1F1;
+}
+
+#postcustomstuff table input,
+#postcustomstuff table textarea {
+	border-color: #dfdfdf;
+	background-color: #fff;
+}
+
+.widefat {
+	border-color: #dfdfdf;
+	background-color: #fff;
+}
+
+div.dashboard-widget-error {
+	background-color: #c43;
+}
+
+div.dashboard-widget-notice {
+	background-color: #cfe1ef;
+}
+
+div.dashboard-widget-submit,
+ul.widget-control-list div.widget-control-actions {
+	border-top-color: #ccc;
+}
+
+div.ui-tabs-panel {
+	border-color: #f1f1f1;
+}
+
+ul#category-tabs li.ui-tabs-selected {
+	background-color: #f1f1f1;
+}
+
+input.disabled,
+textarea.disabled {
+	background-color: #ccc;
+}
+/* #upload-menu li a.upload-tab-link, */
+li.widget-list-control-item h4.widget-title a:hover,
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited,
+.login #backtoblog a:hover,
+#plugin-information .action-button a,
+#plugin-information .action-button a:hover,
+#plugin-information .action-button a:visited {
+	color: #fff;
+}
+
+li.widget-list-control-item div.widget-control {
+	background-color: #fff;
+	border-color: #dfdfdf;
+}
+
+.metabox-holder .postbox h3,
+#poststuff .postbox h3,
+#poststuff .stuffbox h3 {
+	background: #dfdfdf url("../images/gray-grad.png.svg") repeat-x left top;
+	text-shadow: #fff 0 1px 0;
+}
+
+.form-table th,
+.form-wrap label {
+	color: #222;
+	text-shadow: #fff 0 1px 0;
+}
+
+.setting-description, .form-wrap p {
+	color: #666;
+}
+
+select {
+	background-color: #fff;
+	border-color: #ddd;
+}
+
+strong .post-com-count span {
+	background-color: #21759b;
+}
+
+ul#widget-list li.widget-list-item h4.widget-title {
+	background-color: #f0f0f0;
+	color: #000;
+}
+
+.sorthelper {
+	background-color: #ccf3fa;
+}
+
+.ac_match, .subsubsub a.current {
+	color: #000;
+}
+
+.wrap h2 {
+	color: #464646;
+}
+
+.ac_over {
+	background-color: #f0f0b8;
+}
+
+.ac_results {
+	background-color: #fff;
+	border-color: #808080;
+}
+
+.ac_results li {
+	color: #101010;
+}
+
+.alternate, .alt {
+	background-color: #f9f9f9;
+}
+
+.available-theme a.screenshot {
+	background-color: #f1f1f1;
+	border-color: #ddd;
+}
+
+.bar {
+	background-color: #e8e8e8;
+	border-right-color: #99d;
+}
+
+#media-upload {
+	background: #fff;
+}
+#media-upload .slidetoggle {
+	border-top-color: #dfdfdf;
+}
+
+.error, #login #login_error {
+	background-color: #ffebe8;
+	border-color: #c00;
+}
+
+.error a {
+	color: #c00;
+}
+
+.form-invalid {
+	background-color: #ffebe8 !important;
+}
+
+.form-invalid input {
+	border-color: #c00 !important;
+}
+
+.form-table input,
+.form-table textarea,
+.search-input,
+.form-field input,
+.form-field textarea,
+.submit {
+	border-color: #DFDFDF;
+}
+
+.highlight {
+	background-color: #e4f2fd;
+	color: #d54e21;
+}
+
+.howto,
+.nonessential,
+#edit-slug-box,
+.form-input-tip,
+.rss-widget span.rss-date,
+.subsubsub {
+	color: #666;
+}
+
+.media-item {
+	border-bottom-color: #dfdfdf;
+}
+
+#wpbody-content #media-items .describe {
+	border-top-color: #dfdfdf;
+}
+
+.describe input[type="text"],
+.describe textarea {
+	border-color: #dfdfdf;
+}
+
+.media-upload-form label.form-help,
+td.help {
+	color: #9a9a9a;
+}
+
+.post-com-count {
+	background-image: url(../images/bubble_bg.gif.svg);
+	color: #fff;
+}
+
+.post-com-count span {
+	background-color: #bbb;
+	color: #fff;
+}
+
+.post-com-count:hover span {
+	background-color: #d54e21;
+}
+
+.quicktags, .search {
+	background-color: #ccc;
+	color: #000;
+}
+
+.side-info h5, .bordertitle {
+	border-bottom-color: #dadada;
+}
+
+.side-info ul, .widget-description {
+	color: #666;
+}
+
+.button,
+.button-secondary,
+.submit input,
+input[type=button],
+input[type=submit] {
+	border-color: #bbb;
+	color: #464646;
+}
+
+.button:hover,
+.button-secondary:hover,
+.submit input:hover,
+input[type=button]:hover,
+input[type=submit]:hover {
+	color: #000;
+	border-color: #666;
+}
+
+.button,
+.submit input,
+.button-secondary {
+	background: #f2f2f2 url(../images/white-grad.png.svg) repeat-x scroll left top;
+}
+
+.button:active,
+.submit input:active,
+.button-secondary:active {
+	background: #eee url(../images/white-grad-active.png.svg) repeat-x scroll left top;
+}
+
+.button-primary,
+.submit .button-primary,
+#login form .submit input {
+	border-color: #298cba !important;
+	font-weight: bold;
+	color: #FFF !important;
+	background: #21759B url(../images/button-grad.png.svg) repeat-x scroll left top;
+}
+
+.button-primary:active,
+#login form .submit input:active {
+	background: #21759b url(../images/button-grad-active.png.svg) repeat-x scroll left top !important;
+}
+
+.button[disabled],
+.button:disabled,
+.button-secondary[disabled],
+.button-secondary:disabled,
+a.button.disabled {
+	color: #ccc !important;
+	border-color: #ccc;
+}
+
+.button-primary[disabled],
+.button-primary:disabled {
+	color: #2fa0d5 !important;
+}
+
+a:active,
+a:focus {
+	color: #d54e21;
+}
+
+a:hover,
+#wphead #viewsite a:hover,
+#adminmenu a:hover,
+#adminmenu ul.wp-submenu a:hover,
+#the-comment-list .comment a:hover,
+#rightnow a:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover,
+#login form .submit input:hover,
+div.dashboard-widget-submit input:hover,
+#media-upload a.del-link:hover,
+.ui-tabs-nav a:hover {
+	color: #d54e21;
+}
+
+#the-comment-list .comment-item,
+#dashboard-widgets #dashboard_quick_press form p.submit {
+	border-color: #dfdfdf;
+}
+
+.button-primary:hover,
+#login form .submit input:hover {
+	border-color: #13455b !important;
+	color: #EAF2FA !important;
+}
+
+#side-info-column #category-tabs .ui-tabs-selected a {
+	color: #333;
+}
+
+#rightnow .rbutton {
+	background-color: #ebebeb;
+	color: #264761;
+}
+
+.submitbox .submit {
+	background-color: #464646;
+	color: #ccc;
+}
+
+.submitbox .submitdelete, a.delete {
+	color: #f00;
+	border-bottom-color: #f00;
+}
+
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
+	color: #fff;
+	background-color: #f00;
+	border-bottom-color: #f00;
+}
+
+#normal-sortables .submitbox .submitdelete:hover {
+	color: #000;
+	background-color: #f00;
+	border-bottom-color: #f00;
+}
+
+.tablenav .dots {
+	border-color: transparent;
+}
+
+.tablenav .next,
+.tablenav .prev {
+	border-color: transparent;
+	color: #21759b;
+}
+
+.tablenav .next:hover,
+.tablenav .prev:hover {
+	border-color: transparent;
+	color: #d54e21;
+}
+
+.updated,
+.login #login_error,
+.login .message {
+	background-color: #ffffe0;
+	border-color: #e6db55;
+}
+
+a.page-numbers {
+	border-bottom-color: #B8D3E2;
+}
+
+div#available-widgets-filter,
+ul#widget-list li.widget-list-item,
+.commentlist li {
+	border-bottom-color: #ccc;
+}
+
+.widefat td,
+.widefat th {
+	border-color: #dfdfdf;
+}
+
+.widefat th {
+	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
+}
+
+.widefat thead tr th,
+.widefat tfoot tr th,
+h3.dashboard-widget-title,
+h3.dashboard-widget-title span,
+h3.dashboard-widget-title small,
+.find-box-head {
+	color: #333;
+	background: #dfdfdf url(../images/gray-grad.png.svg) repeat-x scroll left top;
+}
+
+h3.dashboard-widget-title small a {
+	color: #d7d7d7;
+}
+
+h3.dashboard-widget-title small a:hover {
+	color: #fff;
+}
+
+#adminmenu a,
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML,
+#the-comment-list p.comment-author strong a,
+#media-upload a.del-link,
+#media-upload a.delete,
+.ui-tabs-nav a, a {
+	color: #21759b;
+}
+
+/* Because we don't want visited on these links */
+body.press-this .ui-tabs-selected a,
+body.press-this .ui-tabs-selected a:hover {
+	background-color: #fff;
+	border-color: #c6d9e9;
+	border-bottom-color: #fff;
+	color: #d54e21;
+}
+
+#adminmenu #awaiting-mod,
+#adminmenu .update-plugins,
+#sidemenu a .update-plugins,
+#rightnow .reallynow,
+#plugin-information .action-button {
+	background-color: #d54e21;
+	color: #fff;
+}
+
+#adminmenu li a:hover #awaiting-mod,
+#adminmenu li a:hover .update-plugins,
+#sidemenu li a:hover .update-plugins {
+	background-color: #264761;
+	color: #fff;
+}
+
+#adminmenu li.current a #awaiting-mod,
+#adminmenu li.current a .update-plugins,
+#adminmenu li.wp-has-current-submenu a .update-plugins,
+#adminmenu li.wp-has-current-submenu a .update-plugins {
+	background-color: #ddd;
+	color: #000;
+	text-shadow: none;
+	-moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	-khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	-webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+	box-shadow: rgba(0,0,0,0.2) 0px -1px 0px;
+}
+
+#adminmenu li.current a:hover #awaiting-mod,
+#adminmenu li.current a:hover .update-plugins,
+#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
+#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
+	background-color: #264761;
+	color: #fff;
+}
+
+div#media-upload-header {
+	background-color: #f9f9f9;
+	border-bottom-color: #dfdfdf;
+}
+
+div#plugin-information-header {
+	background-color: #e4f2fd;
+	border-bottom-color: #c6d9e9;
+}
+
+#currenttheme img {
+	border-color: #666;
+}
+
+#current-widgets .drop-widget-here {
+	background-color: #ffc;
+}
+
+#dashboard_secondary div.dashboard-widget-content ul li a {
+	background-color: #f9f9f9;
+}
+
+input.readonly, textarea.readonly {
+	background-color: #ddd;
+}
+
+#dragHelper h4.widget-title,
+li.widget-list-control-item h4,
+#dragHelper li.widget-list-control-item h4 {
+	background-color: #2683ae;
+	color: #fff;
+}
+
+#ed_toolbar input,
+#ed_reply_toolbar input {
+	background: #fff url("../images/fade-butt.png.svg") repeat-x 0 -2px;
+}
+
+#editable-post-name {
+	background-color: #fffbcc;
+}
+
+#edit-slug-box strong,
+.tablenav .displaying-num,
+#submitted-on {
+	color: #777;
+}
+
+.login #nav a {
+	color: #21759b !important;
+}
+
+.login #nav a:hover {
+	color: #d54e21 !important;
+}
+
+#footer,
+#footer-upgrade {
+	background: #464646;
+	color: #999;
+}
+
+#media-items {
+	border-color: #dfdfdf;
+}
+
+#pass-strength-result {
+	background-color: #eee;
+	border-color: #ddd !important;
+}
+
+#pass-strength-result.bad {
+	background-color: #ffb78c;
+	border-color: #ff853c !important;
+}
+
+#pass-strength-result.good {
+	background-color: #ffec8b;
+	border-color: #fc0 !important;
+}
+
+#pass-strength-result.short {
+	background-color: #ffa0a0;
+	border-color: #f04040 !important;
+}
+
+#pass-strength-result.strong {
+	background-color: #c3ff88;
+	border-color: #8dff1c !important;
+}
+
+.checkbox,
+.side-info,
+#your-profile #rich_editing {
+	background-color: #fff;
+}
+
+.plugins .active {
+	background-color: #e7f7d3;
+}
+
+.plugins .togl {
+	border-right-color: #ccc;
+}
+
+#the-comment-list .unapproved {
+	background-color: #ffffe0;
+}
+
+#the-comment-list .approve a {
+	color: #006505;
+}
+
+#the-comment-list .unapprove a {
+	color: #d98500;
+}
+
+#the-comment-list .delete a {
+	color: #bc0b0b;
+}
+
+.plugins tr {
+	background-color: #fff;
+}
+
+.metabox-holder .postbox,
+#poststuff .postbox,
+#titlediv,
+#poststuff .postarea,
+#poststuff .stuffbox,
+.postbox input[type="text"],
+.postbox textarea,
+.stuffbox input[type="text"],
+.stuffbox textarea {
+	border-color: #dfdfdf;
+}
+
+.metabox-holder .postbox,
+#poststuff .postbox {
+	background-color: #FFF;
+}
+
+.ui-sortable .postbox h3 {
+	color: #464646;
+}
+
+.ui-sortable .postbox h3:hover {
+	color: #000;
+}
+
+.curtime #timestamp {
+	background-image: url(../images/date-button.gif.svg);
+}
+
+#quicktags #ed_link {
+	color: #00f;
+}
+
+#rightnow .youhave {
+	background-color: #f0f6fb;
+}
+
+#rightnow a {
+	color: #448abd;
+}
+
+#tagchecklist span a,
+#bulk-titles div a {
+	background: url(../images/xit.gif.svg) no-repeat;
+}
+
+#tagchecklist span a:hover,
+#bulk-titles div a:hover {
+	background: url(../images/xit.gif.svg) no-repeat -10px 0;
+}
+
+#update-nag, .plugin-update {
+	background-color: #fffeeb;
+	border-bottom-color: #ccc;
+	border-top-color: #ccc;
+	color: #555;
+}
+
+.login #backtoblog a {
+	color: #ccc;
+}
+
+#wphead {
+	background-color: #464646;
+}
+
+body.login {
+	border-top-color: #464646;
+}
+
+#wphead h1 a {
+	color: #fff;
+}
+
+#login form input {
+	color: #555;
+}
+
+#wphead h1 a:hover {
+	text-decoration: underline;
+}
+
+#user_info {
+	color: #999;
+}
+
+#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
+	color: #ccc;
+	text-decoration: none;
+}
+
+#user_info a:hover, #footer a:hover {
+	color: #fff;
+	text-decoration: underline !important;
+}
+
+#user_info a:active, #footer a:active {
+	color: #ccc !important;
+}
+
+div#media-upload-error,
+.file-error,
+abbr.required,
+.widget-control-remove:hover,
+.delete a:hover {
+	color: #f00;
+}
+
+#media-upload a.delete {
+	color: #888;
+}
+
+/* editors */
+#quicktags {
+	border-color: #dfdfdf;
+	background-color: #dfdfdf;
+}
+
+#ed_toolbar input {
+	border-color: #C3C3C3;
+}
+
+#ed_toolbar input:hover {
+	border-color: #aaa;
+	background: #ddd;
+}
+
+#poststuff .wp_themeSkin .mceStatusbar {
+	border-color: #EDEDED;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	background-color: #f1f1f1;
+	border-color: #dfdfdf;
+	color: #999;
+}
+
+#poststuff #editor-toolbar .active {
+	border-bottom-color: #e9e9e9;
+	background-color: #e9e9e9;
+	color: #333;
+}
+
+/* TinyMCE */
+#post-status-info {
+	background-color: #EDEDED;
+}
+
+.wp_themeSkin *,
+.wp_themeSkin a:hover,
+.wp_themeSkin a:link,
+.wp_themeSkin a:visited,
+.wp_themeSkin a:active {
+	 color: #000;
+}
+
+/* Containers */
+.wp_themeSkin iframe {
+	background: #fff;
+}
+
+/* Layout */
+.wp_themeSkin .mceStatusbar {
+	color: #000;
+	background-color: #f5f5f5;
+}
+
+/* Button */
+.wp_themeSkin .mceButton {
+	background-color: #e9e8e8;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin a.mceButtonEnabled:hover,
+.wp_themeSkin a.mceButtonActive,
+.wp_themeSkin a.mceButtonSelected {
+	background-color: #d5d5d5;
+	border-color: #777 !important;
+}
+
+.wp_themeSkin .mceButtonDisabled {
+	border-color: #ccc !important;
+}
+
+/* ListBox */
+.wp_themeSkin .mceListBox .mceText,
+.wp_themeSkin .mceListBox .mceOpen  {
+	border-color: #B2B2B2;
+	background-color: #d5d5d5;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
+.wp_themeSkin .mceListBoxHover .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceText {
+	border-color: #777 !important;
+	background-color: #d5d5d5;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
+.wp_themeSkin .mceListBoxHover .mceText {
+	border-color: #777 !important;
+}
+
+.wp_themeSkin select.mceListBox {
+	border-color: #B2B2B2;
+	background-color: #fff;
+}
+
+/* SplitButton */
+.wp_themeSkin .mceSplitButton a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceOpen {
+	background-color: #e8e8e8;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceSplitButton a.mceOpen:hover,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceAction:hover {
+	background-color: #d5d5d5;
+	border-color: #777 !important;
+}
+
+.wp_themeSkin .mceSplitButtonActive {
+	background-color: #B2B2B2;
+}
+
+/* ColorSplitButton */
+.wp_themeSkin div.mceColorSplitMenu table {
+	background-color: #ebebeb;
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceColorSplitMenu a {
+	border-color: #B2B2B2;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
+	border-color: #fff;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
+	border-color: #0A246A;
+	background-color: #B6BDD2;
+}
+
+.wp_themeSkin a.mceMoreColors:hover {
+	border-color: #0A246A;
+}
+
+/* Menu */
+.wp_themeSkin .mceMenu {
+	border-color: #ddd;
+}
+
+.wp_themeSkin .mceMenu table {
+	background-color: #ebeaeb;
+}
+
+.wp_themeSkin .mceMenu .mceText {
+	color: #000;
+}
+
+.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
+.wp_themeSkin .mceMenu .mceMenuItemActive {
+	background-color: #f5f5f5;
+}
+.wp_themeSkin td.mceMenuItemSeparator {
+	background-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle a {
+	background-color: #ccc;
+	border-bottom-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle span.mceText {
+	color: #000;
+}
+.wp_themeSkin .mceMenuItemDisabled .mceText {
+	color: #888;
+}
+
+.wp_themeSkin tr.mceFirst td.mceToolbar {
+	background-color: #dfdfdf;
+	border-color: #dfdfdf;
+}
+
+.wp-admin #mceModalBlocker {
+	background: #000;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft {
+	background: #444444;
+	border-left: 1px solid #999;
+	border-top: 1px solid #999;
+	-moz-border-radius: 4px 0 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-khtml-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight {
+	background: #444444;
+	border-right: 1px solid #999;
+	border-top: 1px solid #999;
+	border-top-right-radius: 4px;
+	-khtml-border-top-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius: 0 4px 0 0;
+}
+
+.wp-admin .clearlooks2 .mceMiddle .mceLeft {
+	background: #f1f1f1;
+	border-left: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceMiddle .mceRight {
+	background: #f1f1f1;
+	border-right: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceLeft {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+	border-left: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceCenter {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceBottom .mceRight {
+	background: #f1f1f1;
+	border-bottom: 1px solid #999;
+	border-right: 1px solid #999;
+}
+
+.wp-admin .clearlooks2 .mceFocus .mceTop span {
+	color: #e5e5e5;
+}
+/* end TinyMCE */
+
+#editorcontainer,
+#post-status-info,
+#titlediv #title {
+	border-color: #dfdfdf;
+}
+
+#titlediv #title {
+	background-color: #fff;
+}
+
+#tTips p#tTips_inside {
+	background-color: #ddd;
+	color: #333;
+}
+
+#timestampdiv input,
+#namediv input,
+#tagsdiv #the-tagcloud {
+	border-color: #ddd;
+}
+
+/* menu */
+#adminmenu * {
+	border-color: #e3e3e3;
+}
+
+#adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif.svg) no-repeat scroll left 5px;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+	background: transparent url(../images/menu-arrows.gif.svg) no-repeat scroll right -34px;
+}
+
+#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -207px;
+}
+
+#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+#adminmenu .wp-menu-open .wp-menu-toggle {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -109px;
+}
+
+#adminmenu a.menu-top {
+	background: #f1f1f1 url(../images/menu-bits.gif.svg) repeat-x scroll left -379px;
+}
+
+#adminmenu .wp-submenu a {
+	background: #FFFFFF url(../images/menu-bits.gif.svg) no-repeat scroll 0 -310px;
+}
+
+#adminmenu .wp-has-current-submenu ul li a {
+	background: none;
+}
+
+#adminmenu .wp-has-current-submenu ul li a.current {
+	background: url(../images/menu-dark.gif.svg) top left no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu .menu-top .current {
+	background: #6d6d6d url(../images/menu-bits.gif.svg) top left repeat-x;
+	border-color: #6d6d6d;
+	color: #fff;
+	text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
+}
+
+#adminmenu li.wp-has-current-submenu .wp-submenu,
+#adminmenu li.wp-has-current-submenu ul li a {
+	border-color: #aaa !important;
+}
+
+#adminmenu li.wp-has-current-submenu ul li a {
+	background: url(../images/menu-dark.gif.svg) bottom left no-repeat !important;
+}
+
+#adminmenu li.wp-has-current-submenu ul {
+	border-bottom-color: #aaa;
+}
+
+#adminmenu li.menu-top .current:hover {
+	border-color: #B5B5B5;
+}
+
+#adminmenu .wp-submenu .current a.current {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll  0 -289px;
+}
+
+#adminmenu .wp-submenu a:hover {
+	background-color: #EAF2FA !important;
+	color: #333 !important;
+}
+
+#adminmenu .wp-submenu li.current,
+#adminmenu .wp-submenu li.current a,
+#adminmenu .wp-submenu li.current a:hover {
+	color: #333;
+	background-color: #f5f5f5;
+	background-image: none;
+	border-color: #e3e3e3;
+	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
+}
+
+#adminmenu .wp-submenu ul {
+	background-color: #fff;
+}
+
+.folded #adminmenu li.menu-top,
+#adminmenu .wp-submenu .wp-submenu-head {
+	background-color: #F1F1F1;
+}
+
+.folded #adminmenu li.wp-has-current-submenu,
+.folded #adminmenu li.menu-top.current {
+	background-color: #e6e6e6;
+}
+
+#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
+	background-color: #EAEAEA;
+	border-color: #aaa;
+}
+
+#adminmenu div.wp-submenu {
+	background-color: transparent;
+}
+
+/* menu icons */
+#adminmenu #menu-dashboard div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -61px -33px;
+}
+
+#adminmenu #menu-dashboard:hover div.wp-menu-image,
+#adminmenu  #menu-dashboard.wp-has-current-submenu div.wp-menu-image,
+#adminmenu  #menu-dashboard.current div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -61px -1px;
+}
+
+#adminmenu #menu-posts div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -272px -33px;
+}
+
+#adminmenu #menu-posts:hover div.wp-menu-image,
+#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -272px -1px;
+}
+
+#adminmenu #menu-media div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -121px -33px;
+}
+
+#adminmenu #menu-media:hover div.wp-menu-image,
+#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -121px -1px;
+}
+
+#adminmenu #menu-links div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -91px -33px;
+}
+
+#adminmenu #menu-links:hover div.wp-menu-image,
+#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -91px -1px;
+}
+
+#adminmenu #menu-pages div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -151px -33px;
+}
+
+#adminmenu #menu-pages:hover div.wp-menu-image,
+#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -151px -1px;
+}
+
+#adminmenu #menu-comments div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -31px -33px;
+}
+
+#adminmenu #menu-comments:hover div.wp-menu-image,
+#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image,
+#adminmenu #menu-comments.current div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -31px -1px;
+}
+
+#adminmenu #menu-appearance div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -1px -33px;
+}
+
+#adminmenu #menu-appearance:hover div.wp-menu-image,
+#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -1px -1px;
+}
+
+#adminmenu #menu-plugins div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -181px -33px;
+}
+
+#adminmenu #menu-plugins:hover div.wp-menu-image,
+#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -181px -1px;
+}
+
+#adminmenu #menu-users div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -301px -33px;
+}
+
+#adminmenu #menu-users:hover div.wp-menu-image,
+#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -301px -1px;
+}
+
+#adminmenu #menu-tools div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -211px -33px;
+}
+
+#adminmenu #menu-tools:hover div.wp-menu-image,
+#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -211px -1px;
+}
+
+#adminmenu #menu-settings div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -241px -33px;
+}
+
+#adminmenu #menu-settings:hover div.wp-menu-image,
+#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url("../images/menu.png.svg") no-repeat scroll -241px -1px;
+}
+/* end menu */
+
+
+/* Diff */
+table.diff .diff-deletedline {
+	background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+	background-color: #ff9999;
+}
+table.diff .diff-addedline {
+	background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+	background-color: #99ff99;
+}
+
+#att-info {
+	background-color: #E4F2FD;
+}
+
+/* edit image */
+#sidemenu a {
+	background-color: #f9f9f9;
+	border-color: #f9f9f9;
+	border-bottom-color: #dfdfdf;
+}
+
+#sidemenu a.current {
+	background-color: #fff;
+	border-color: #dfdfdf #dfdfdf #fff;
+	color: #D54E21;
+}
+
+
+#screen-options-wrap,
+#contextual-help-wrap {
+	background-color: #f1f1f1;
+	border-color: #dfdfdf;
+}
+
+#screen-meta-links a.show-settings {
+	color: #606060;
+}
+
+#screen-meta-links a.show-settings:hover {
+	color: #000;
+}
+
+#replysubmit {
+	background-color: #f1f1f1;
+	border-top-color: #ddd;
+}
+
+#replyerror {
+	border-color: #ddd;
+	background-color: #f9f9f9;
+}
+
+#edithead,
+#replyhead {
+	background-color: #f1f1f1;
+}
+
+#ed_reply_toolbar {
+	background-color: #e9e9e9;
+}
+
+/* table vim shortcuts */
+.vim-current {
+	background-color: #E4F2FD !important;
+}
+
+/* Install Plugins */
+.star-average,
+.star.star-rating {
+	background-color: #fc0;
+}
+
+div.star.select:hover {
+	background-color: #d00;
+}
+
+#plugin-information .fyi ul {
+	background-color: #eaf3fa;
+}
+
+#plugin-information .fyi h2.mainheader {
+	background-color: #cee1ef;
+}
+
+#plugin-information pre,
+#plugin-information code {
+	background-color: #ededff;
+}
+
+#plugin-information pre {
+	border: 1px solid #ccc;
+}
+
+/* inline editor */
+.inline-edit-row fieldset input[type="text"],
+.inline-edit-row fieldset textarea,
+#bulk-titles,
+#replyrow input {
+	border-color: #ddd;
+}
+
+.inline-editor div.title {
+	background-color: #EAF3FA;
+}
+
+.inline-editor ul.cat-checklist {
+	background-color: #FFFFFF;
+	border-color: #ddd;
+}
+
+.inline-edit-row p.submit {
+	background-color: #f1f1f1;
+}
+
+.inline-editor .categories .catshow,
+.inline-editor .categories .cathide {
+	color: #21759b;
+}
+
+.inline-editor .quick-edit-save {
+	background-color: #f1f1f1;
+}
+
+#replyrow #ed_reply_toolbar input:hover {
+	border-color: #aaa;
+	background: #ddd;
+}
+
+fieldset.inline-edit-col-right .inline-edit-col {
+	border-color: #dfdfdf;
+}
+
+.attention {
+	color: #D54E21;
+}
+
+.meta-box-sortables .postbox:hover .handlediv {
+	background: transparent url(../images/menu-bits.gif.svg) no-repeat scroll left -111px;
+}
+
+#major-publishing-actions {
+	background: #eaf2fa;
+}
+
+.tablenav .tablenav-pages {
+	color: #555;
+}
+
+.tablenav .tablenav-pages a {
+	border-color: #e3e3e3;
+	background: #eee url('../images/menu-bits.gif.svg') repeat-x scroll left -379px;
+}
+
+.tablenav .tablenav-pages a:hover {
+	color: #d54e21;
+	border-color: #d54321;
+}
+
+.tablenav .tablenav-pages a:active {
+	color: #fff !important;
+}
+
+.tablenav .tablenav-pages .current {
+	background: #dfdfdf;
+	border-color: #d3d3d3;
+}
+
+#availablethemes,
+#availablethemes td {
+	border-color: #ddd;
+}
+
+#current-theme img {
+	border-color: #999;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link,
+#TB_window #TB_title a.tb-theme-preview-link:visited {
+	color: #999;
+}
+
+#TB_window #TB_title a.tb-theme-preview-link:hover,
+#TB_window #TB_title a.tb-theme-preview-link:focus {
+	color: #ccc;
+}
+
+.misc-pub-section {
+	border-bottom-color: #eee;
+}
+
+#minor-publishing {
+	border-bottom-color: #ddd;
+}
+
+#post-body .misc-pub-section {
+	border-right-color: #eee;
+}
+
+.post-com-count span {
+	background-color: #bbb;
+}
+
+.form-table .color-palette td {
+	border-color: #fff;
+}
+
+.sortable-placeholder {
+	border-color: #bbb;
+	background-color: #f5f5f5;
+}
+
+#post-body ul#category-tabs li.ui-tabs-selected a {
+	color: #333;
+}
+
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
+	border-color: #999;
+	background-color: #eee;
+}
+
+#wp_editimgbtn:hover,
+#wp_delimgbtn:hover,
+#wp_editgallery:hover,
+#wp_delgallery:hover {
+	border-color: #555;
+	background-color: #ccc;
+}
+
+#favorite-first {
+	background: #797979 url(../images/fav.png.svg) repeat-x left center;
+	border-color: #777 !important;
+	border-bottom-color: #666 !important;
+}
+
+#favorite-inside {
+	border-color: #797979;
+	background-color: #797979;
+}
+
+#favorite-toggle {
+	background: transparent url(../images/fav-arrow.gif.svg) no-repeat 0 -4px;
+}
+
+#favorite-actions a {
+	color: #ddd;
+}
+
+#favorite-actions a:hover {
+	color: #fff;
+}
+
+#favorite-inside a:hover {
+	text-decoration: underline;
+}
+
+#favorite-actions .slide-down {
+	border-bottom-color: #626262;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+.button-primary,
+.submit .button-primary {
+	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
+}
+
+#screen-meta a.show-settings {
+	background-color: transparent;
+	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
+}
+
+#icon-edit,
+#icon-post {
+	background: transparent url(../images/icons32.png.svg) no-repeat -552px -5px;
+}
+
+#icon-index {
+	background: transparent url(../images/icons32.png.svg) no-repeat -137px -5px;
+}
+
+#icon-upload {
+	background: transparent url(../images/icons32.png.svg) no-repeat -251px -5px;
+}
+
+#icon-link-manager,
+#icon-link,
+#icon-link-category {
+	background: transparent url(../images/icons32.png.svg) no-repeat -190px -5px;
+}
+
+#icon-edit-pages,
+#icon-page {
+	background: transparent url(../images/icons32.png.svg) no-repeat -312px -5px;
+}
+
+#icon-edit-comments {
+	background: transparent url(../images/icons32.png.svg) no-repeat -72px -5px;
+}
+
+#icon-themes {
+	background: transparent url(../images/icons32.png.svg) no-repeat -11px -5px;
+}
+
+#icon-plugins {
+	background: transparent url(../images/icons32.png.svg) no-repeat -370px -5px;
+}
+
+#icon-users,
+#icon-user-edit {
+	background: transparent url(../images/icons32.png.svg) no-repeat -600px -5px;
+}
+
+#icon-tools,
+#icon-admin {
+	background: transparent url(../images/icons32.png.svg) no-repeat -432px -5px;
+}
+
+#icon-options-general {
+	background: transparent url(../images/icons32.png.svg) no-repeat -492px -5px;
+}
+
+.view-switch #view-switch-list {
+	background: transparent url(../images/list.png.svg) no-repeat 0 0;
+}
+
+.view-switch #view-switch-list.current {
+	background: transparent url(../images/list.png.svg) no-repeat -40px 0;
+}
+
+.view-switch #view-switch-excerpt {
+	background: transparent url(../images/list.png.svg) no-repeat -20px 0;
+}
+
+.view-switch #view-switch-excerpt.current {
+	background: transparent url(../images/list.png.svg) no-repeat -60px 0;
+}
+
+#header-logo {
+	background: transparent url(../images/wp-logo.gif.svg) no-repeat scroll center center;
+}
diff -uNr a/mp-wp/wp-admin/css/dashboard-rtl.css b/mp-wp/wp-admin/css/dashboard-rtl.css
--- a/mp-wp/wp-admin/css/dashboard-rtl.css false
+++ b/mp-wp/wp-admin/css/dashboard-rtl.css 5d11294fdb3f269debb35877e198d8eb016ad0feea31b34eb7e5ceeff03e0f063fccb8ac8a2f05bbe2f3679cbfae694f3e6e96131144908f0e38c953a86a3b95
@@ -0,0 +1,93 @@
+#dashboard-widgets-wrap .has-sidebar {
+	margin-right: 0;
+	margin-left: -51%;
+}
+#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
+	margin-right: 0;
+	margin-left: 51%;
+}
+.view-all {
+	right: auto;
+	left: 0;
+}
+#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now td.b {
+	padding-right: 0;
+	padding-left: 6px;
+	text-align: left;
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now .t {
+	padding-right: 0;
+	padding-left: 12px;
+}
+#dashboard_right_now .versions a {
+	font-family: Tahoma, Arial;
+}
+#dashboard_right_now a.button {
+	float: left;
+	clear: left;
+}
+#dashboard-widgets h3 .postbox-title-action {
+	right: auto;
+	left: 30px;
+}
+#the-comment-list .pingback {
+	padding-left: 0 !important;
+	padding-right: 9px !important;
+}
+/* Recent Comments */
+#the-comment-list .comment-item {
+	padding: 1em 70px 1em 10px;
+}
+#the-comment-list .comment-item .avatar {
+	float: right;
+	margin-left: 0;
+	margin-right: -60px;
+}
+/* Feeds */
+.rss-widget cite {
+	text-align: left;
+}
+.rss-widget span.rss-date {
+	font-family: Tahoma, Arial;
+	margin-left: 0;
+	margin-right: 3px;
+}
+/* QuickPress */
+#dashboard_quick_press h4 {
+	float: right;
+	text-align: left;
+}
+#dashboard_quick_press h4 label {
+	margin-right: 0;
+	margin-left: 10px;
+}
+#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
+	margin: 0 5em 1em 0;
+}
+#dashboard_quick_press #media-buttons {
+	margin: 0 5em .5em 0;
+	padding: 0 10px 0 0;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit {
+	margin-left: 0;
+	margin-right: 4.6em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit input {
+	float: right;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
+	margin: 0 10px 0 1em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #publish {
+	float: left;
+}
+/* Recent Drafts */
+#dashboard_recent_drafts h4 abbr {
+	font-family: Tahoma, Arial;
+	margin-left:0;
+	margin-right: 3px;
+}
diff -uNr a/mp-wp/wp-admin/css/dashboard.css b/mp-wp/wp-admin/css/dashboard.css
--- a/mp-wp/wp-admin/css/dashboard.css false
+++ b/mp-wp/wp-admin/css/dashboard.css 7eddde7772d1e7c38d7421a20a7dbba10df2bddd98fe521be4cfe3c15af6db0b273c11a1a8426ca04c9f1a4fe3da8e3382aa6a347382b34215ed7e6d5f98d280
@@ -0,0 +1,396 @@
+.postbox p, .postbox ul, .postbox ol, .postbox blockquote, #wp-version-message { font-size: 11px; }
+
+.edit-box {
+	display: none;
+}
+
+h3:hover .edit-box {
+	display: inline;
+}
+
+form .input-text-wrap {
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px 3px;
+	border-color: #ccc;
+}
+
+#dashboard-widgets form .input-text-wrap input {
+	border: 0 none;
+	outline: none;
+	margin: 0;
+	padding: 0;
+	width: 99%;
+	color: #333;
+}
+
+form .textarea-wrap {
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px;
+	border-color: #ccc;
+}
+
+#dashboard-widgets form .textarea-wrap textarea {
+	border: 0 none;
+	padding: 0;
+	outline: none;
+	width: 99%;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+#dashboard-widgets .postbox form .submit {
+	float: none;
+	margin: .5em 0 0;
+	padding: 0;
+	border: none;
+}
+
+#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input {
+	margin: 0;
+}
+
+#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish {
+	min-width: 0;
+}
+
+#dashboard-widgets-wrap .has-sidebar {
+	margin-right: -51%;
+}
+
+#dashboard-widgets-wrap .inner-sidebar {
+	width: 49%;
+}
+
+#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
+	margin-right: 51%;
+}
+
+div.postbox div.inside {
+	margin: 10px;
+	position: relative;
+}
+
+#dashboard-widgets a {
+	text-decoration: none;
+}
+
+#dashboard-widgets h3 a {
+	text-decoration: underline;
+}
+
+#dashboard-widgets h3 .postbox-title-action {
+	position: absolute;
+	right: 30px;
+	padding: 0;
+}
+
+#dashboard-widgets h4 {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 13px;
+	margin: 0 0 .2em;
+	padding: 0;
+}
+
+/* Right Now */
+
+#dashboard_right_now p.sub,
+#dashboard_right_now .table, #dashboard_right_now .versions {
+	margin: -12px;
+}
+
+#dashboard_right_now .inside {
+	font-size: 12px;
+}
+
+#dashboard_right_now p.sub {
+	font-style: italic;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	padding: 5px 10px 15px;
+	color: #777;
+	font-size: 13px;
+}
+
+#dashboard_right_now .table {
+	background: #f9f9f9;
+	border-top: #ececec 1px solid;
+	border-bottom: #ececec 1px solid;
+	margin: 0 -9px 10px;
+	padding: 0 10px;
+}
+
+#dashboard_right_now table {
+	width: 100%;
+}
+
+#dashboard_right_now table  td {
+	border-top: #ececec 1px solid;
+	padding: 3px 0;
+	white-space: nowrap;
+}
+
+#dashboard_right_now table tr.first td {
+	border-top: none;
+}
+
+#dashboard_right_now td.b {
+	padding-right: 6px;
+	text-align: right;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 14px;
+}
+
+#dashboard_right_now td.b a {
+	font-size: 18px;
+}
+
+#dashboard_right_now td.b a:hover {
+	color: #d54e21;
+}
+
+#dashboard_right_now .t {
+	font-size: 12px;
+	padding-right: 12px;
+	padding-top: 6px;
+	color: #777;
+}
+
+#dashboard_right_now td.first,
+#dashboard_right_now td.last {
+	width: 1px;
+}
+
+#dashboard_right_now .spam {
+	color: red;
+}
+
+#dashboard_right_now .waiting {
+	color: orange;
+}
+
+#dashboard_right_now .approved {
+	color: green;
+}
+
+#dashboard_right_now .versions {
+	padding: 6px 10px 12px;
+}
+
+#dashboard_right_now .versions .b {
+	font-weight: bold;
+}
+
+#dashboard_right_now a.button {
+	float: right;
+	clear: right;
+	position: relative;
+	top: -5px;
+}
+
+/* Recent Comments */
+
+#dashboard_recent_comments h3 {
+	margin-bottom: 0;
+}
+
+#dashboard_recent_comments .inside {
+	margin-top: 0;
+}
+
+#dashboard_recent_comments .comment-meta .approve {
+	font-style: italic;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	font-size: 10px;
+}
+
+#the-comment-list {
+	position: relative;
+}
+
+#the-comment-list .comment-item {
+	padding: 1em 10px 1em 70px;
+	border-top: 1px solid;
+}
+
+#the-comment-list .pingback {
+	padding-left: 9px !important;
+}
+
+#the-comment-list .comment-item,
+#the-comment-list #replyrow {
+	margin: 0 -10px;
+}
+
+#the-comment-list .comment-item:first-child {
+	border-top: none;
+}
+
+#the-comment-list .comment-item .avatar {
+	float: left;
+	margin-left: -60px;
+}
+
+#the-comment-list .comment-item h4 {
+	line-height: 1.4;
+	margin-top: -.2em;
+	font-weight: normal;
+	color: #999;
+}
+
+#the-comment-list .comment-item h4 cite {
+	font-style: normal;
+	font-weight: normal;
+}
+
+#the-comment-list .comment-item blockquote,
+#the-comment-list .comment-item blockquote p {
+	margin: 0;
+	padding: 0;
+	display: inline;
+}
+
+#dashboard_recent_comments #the-comment-list .trackback blockquote,
+#dashboard_recent_comments #the-comment-list .pingback blockquote {
+	display: block;
+}
+
+#the-comment-list .comment-item p.row-actions {
+	margin: 3px 0 0;
+	padding: 0;
+	font-size: 10px;
+}
+
+/* QuickPress */
+
+#dashboard_quick_press h4 {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	float: left;
+	width: 5.5em;
+	clear: both;
+	font-weight: normal;
+	text-align: right;
+	padding-top: 5px;
+	font-size: 12px;
+}
+
+#dashboard_quick_press h4 label {
+	margin-right: 10px;
+}
+
+#dashboard_quick_press .input-text-wrap,
+#dashboard_quick_press .textarea-wrap {
+	margin: 0 0 1em 5em;
+}
+
+#dashboard_quick_press #media-buttons {
+	margin: 0 0 .5em 5em;
+	padding: 0 0 0 10px;
+	font-size: 11px;
+}
+
+#dashboard_quick_press #media-buttons a {
+	vertical-align: bottom;
+}
+
+#dashboard-widgets #dashboard_quick_press form p.submit {
+	margin-left: 4.6em;
+}
+
+#dashboard-widgets #dashboard_quick_press form p.submit input {
+	float: left;
+}
+
+#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
+	margin: 0 1em 0 10px;
+}
+
+#dashboard-widgets #dashboard_quick_press form p.submit #publish {
+	float: right;
+}
+
+/* Recent Drafts */
+#dashboard_recent_drafts ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#dashboard_recent_drafts ul li {
+	margin-bottom: 0.6em;
+}
+
+#dashboard_recent_drafts h4 {
+	font-weight: normal;
+}
+
+#dashboard_recent_drafts h4 abbr {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	font-size: 11px;
+	color: #999;
+	margin-left: 3px;
+}
+
+#dashboard_recent_drafts p {
+	margin: 0;
+	padding: 0;
+}
+
+/* Feeds */
+
+.rss-widget ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+a.rsswidget {
+	font-size: 13px;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	line-height: 1.7em;
+}
+
+.rss-widget ul li {
+	line-height: 1.5em;
+	margin-bottom: 12px;
+}
+
+.rss-widget span.rss-date {
+	margin-left: 3px;
+}
+
+.rss-widget cite {
+	display: block;
+	text-align: right;
+	margin: 0 0 1em;
+	padding: 0;
+}
+
+.rss-widget cite:before {
+	content: '\2014';
+}
+
+/* Plugins */
+
+#dashboard_plugins h4 {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+#dashboard_plugins h5 {
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size: 13px !important;
+	margin: 0;
+	display: inline;
+	line-height: 1.4em;
+}
+
+#dashboard_plugins h5 a {
+	font-weight: normal;
+	line-height: 1.7em;
+}
+
+#dashboard_plugins p {
+	margin: 0 0 1.4em;
+	line-height: 1.4em;
+}
diff -uNr a/mp-wp/wp-admin/css/farbtastic-rtl.css b/mp-wp/wp-admin/css/farbtastic-rtl.css
--- a/mp-wp/wp-admin/css/farbtastic-rtl.css false
+++ b/mp-wp/wp-admin/css/farbtastic-rtl.css 2bf6f8e23fe295014dbbf797cc021102ecd3dc888f7d4f675c7297c9fe4606b2f226a1599e6282ae0ab5d2b6b03ba5ef26bec3a245e24ca518e20b9933020a31
@@ -0,0 +1,7 @@
+.farbtastic .color, .farbtastic .overlay {
+	left: 0;
+	right: 47px;
+}
+.farbtastic .marker {
+	margin: -8px -8px 0 0;
+}
diff -uNr a/mp-wp/wp-admin/css/farbtastic.css b/mp-wp/wp-admin/css/farbtastic.css
--- a/mp-wp/wp-admin/css/farbtastic.css false
+++ b/mp-wp/wp-admin/css/farbtastic.css 91a789f6aacb18b91f033245c61f5b9d8ec4100882617558fe83478ae582f06f7fc895ea38f29c77f0524fc52f5717dea62f08c9c70a95a6167a9145040923d8
@@ -0,0 +1,32 @@
+.farbtastic {
+  position: relative;
+}
+.farbtastic * {
+  position: absolute;
+  cursor: crosshair;
+}
+.farbtastic, .farbtastic .wheel {
+  width: 195px;
+  height: 195px;
+}
+.farbtastic .color, .farbtastic .overlay {
+  top: 47px;
+  left: 47px;
+  width: 101px;
+  height: 101px;
+}
+.farbtastic .wheel {
+  background: url(../images/wheel.png.svg) no-repeat;
+  width: 195px;
+  height: 195px;
+}
+.farbtastic .overlay {
+  background: url(../images/mask.png.svg) no-repeat;
+}
+.farbtastic .marker {
+  width: 17px;
+  height: 17px;
+  margin: -8px 0 0 -8px;
+  overflow: hidden;
+  background: url(../images/marker.png.svg) no-repeat;
+}
diff -uNr a/mp-wp/wp-admin/css/global-rtl.css b/mp-wp/wp-admin/css/global-rtl.css
--- a/mp-wp/wp-admin/css/global-rtl.css false
+++ b/mp-wp/wp-admin/css/global-rtl.css 09d014c1b926f87f579ff15fb1610c2d1cc2ebed87c76a42d99f8c4a7078b3a680f079173bee90c68f76a5c66c12ee2af8f588c56e7f608f8046848e9d3fe460
@@ -0,0 +1,74 @@
+/* 2 column liquid layout */
+#adminmenu {
+	float: right;
+	clear: right;
+	margin-right:-160px;
+	margin-left: 5px;
+}
+div.folded #adminmenu {
+	margin-left: 0;
+	margin-right: -45px;
+}
+/* inner 2 column liquid layout */
+.inner-sidebar {
+	float: left;
+	clear: left;
+}
+.has-sidebar {
+	float: right;
+	clear: right;
+	margin-right: 0;
+	margin-left: -340px;
+}
+.has-sidebar .has-sidebar-content {
+	margin-right: 0;
+	margin-left: 305px;
+}
+#wpbody {
+	margin-left:0;
+	margin-right: 175px;
+}
+.folded #wpbody {
+	margin-left: 0;
+	margin-right: 60px;
+}
+#wpbody-content {
+	float: right;
+}
+/* 2 columns main area */
+#col-right {
+	float: left;
+	clear: left;
+}
+.wrap {
+	margin: 0 5px 0 15px;
+}
+/* styles for use by people extending the WordPress interface */
+body, td, textarea, input, select {
+	font-family: Tahoma, arial;
+}
+.alignleft {
+	float: right;
+}
+.alignright {
+	float: left;
+}
+.subsubsub {
+	float: right;
+}
+.widefat th {
+	text-align: right;
+}
+.widefat th input {
+	margin: 0 8px 0 0;
+}
+.wrap h2 {
+	font-family: arial;
+	padding: 14px 0 3px 15px;
+}
+.wrap h2.long-header {
+	padding-left: 0;
+}
+.updated, .error {
+	clear: both;
+}
diff -uNr a/mp-wp/wp-admin/css/global.css b/mp-wp/wp-admin/css/global.css
--- a/mp-wp/wp-admin/css/global.css false
+++ b/mp-wp/wp-admin/css/global.css ab8bc61ed9622a262135a0d980cf00dd63d174976649d82e55557d5c1aeb39e72f13104e97170eddfebdca1f0ae7f661f614a207f629ee51365838cc4abaec6b
@@ -0,0 +1,455 @@
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+/*	font-size: 100%;
+	vertical-align: baseline; */
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+/*
+:focus {
+	outline: 0;
+}
+*/
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+/*
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+*/
+/* end reset css */
+
+
+/* 2 column liquid layout */
+#wpwrap {
+	height: auto;
+	min-height: 100%;
+	width: 100%;
+}
+
+#wpcontent {
+	height: 100%;
+	padding-bottom: 50px;
+}
+
+#wpbody {
+	clear: both;
+	margin-left: 175px;
+}
+
+.folded #wpbody {
+	margin-left: 60px;
+}
+
+#wpbody-content {
+	float: left;
+	width: 100%;
+}
+
+#adminmenu {
+	float: left;
+	clear: left;
+	width: 145px;
+	margin-top: 15px;
+	margin-right: 5px;
+	margin-bottom: 15px;
+	margin-left: -160px;
+	position: relative;
+	padding: 0;
+	list-style: none;
+}
+
+.folded #adminmenu {
+	margin-left: -45px;
+}
+
+.folded #adminmenu,
+.folded #adminmenu li.menu-top {
+	width: 28px;
+}
+
+#footer {
+	clear: both;
+	position: relative;
+	width: 100%;
+}
+
+/* inner 2 column liquid layout */
+
+.inner-sidebar {
+	float: right;
+	clear: right;
+	width: 280px;
+	position: relative;
+}
+
+.has-sidebar {
+	float: left;
+	clear: left;
+	width: 100%;
+	margin-right: -340px;
+}
+
+.has-sidebar .has-sidebar-content {
+	margin-right: 305px;
+}
+
+/* 2 columns main area */
+
+#col-container {
+	overflow: hidden;
+	padding: 0;
+	margin: 0;
+}
+
+#col-left {
+	padding: 0;
+	margin: 0;
+	overflow: hidden;
+	width: 39%;
+}
+
+#col-right {
+	float: right;
+	clear: right;
+	overflow: hidden;
+	padding: 0;
+	margin: 0;
+	width: 59%;
+}
+
+/* utility classes */
+.alignleft {
+	float: left;
+}
+
+.alignright {
+	float: right;
+}
+
+.textleft {
+	text-align: left;
+}
+
+.textright {
+	text-align: right;
+}
+
+.clear {
+	clear: both;
+}
+
+.hidden,
+.closed .inside,
+.hide-if-no-js {
+	display: none;
+}
+
+/* include margin and padding in the width calculation of input and textarea */
+input[type="text"],
+textarea {
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-ms-box-sizing: border-box; /* ie8 only */
+	box-sizing: border-box;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+	vertical-align: text-top;
+}
+
+/* styles for use by people extending the WordPress interface */
+html,
+body {
+	height: 100%;
+}
+
+body,
+td {
+	font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+p {
+	margin: 1em 0;
+}
+
+blockquote {
+	margin: 1em;
+}
+
+label {
+	cursor: pointer;
+}
+
+li,
+dd {
+	margin-bottom: 6px;
+}
+
+p,
+li,
+dl,
+dd,
+dt {
+	line-height: 140%;
+}
+
+textarea,
+input,
+select {
+	font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	margin: 1px;
+	padding: 3px;
+}
+
+h1 {
+  display: block;
+  font-size: 2em;
+  font-weight: bold;
+  margin: .67em 0;
+}
+
+h2 {
+  display: block;
+  font-size: 1.5em;
+  font-weight: bold;
+  margin: .83em 0;
+}
+
+h3 {
+  display: block;
+  font-size: 1.17em;
+  font-weight: bold;
+  margin: 1em 0;
+}
+
+h4 {
+  display: block;
+  font-weight: bold;
+  margin: 1.33em 0;
+}
+
+h5 {
+  display: block;
+  font-size: 0.83em;
+  font-weight: bold;
+  margin: 1.67em 0;
+}
+
+h6 {
+  display: block;
+  font-size: 0.67em;
+  font-weight: bold;
+  margin: 2.33em 0;
+}
+
+.subsubsub {
+	list-style: none;
+	margin: 8px 0 5px;
+	padding: 0;
+	white-space: nowrap;
+	font-size: 11px;
+	float: left;
+}
+
+.subsubsub a {
+	line-height: 2;
+	padding: .2em;
+	text-decoration: none;
+}
+
+.subsubsub a .count, .subsubsub a.current .count {
+	color: #999;
+	font-weight: normal;
+}
+
+.subsubsub a.current {
+	font-weight: bold;
+	background: none;
+	border: none;
+}
+
+.subsubsub li {
+	display: inline;
+	margin: 0;
+	padding: 0;
+}
+
+.widefat {
+	border-width: 1px;
+	border-style: solid;
+	border-collapse: separate;
+	border-spacing: 0;
+	width: 100%;
+	clear: both;
+	margin: 0;
+	-moz-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.widefat * {
+	word-wrap: break-word;
+}
+
+.widefat a {
+	text-decoration: none;
+}
+
+.widefat td,
+.widefat th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	font-size: 11px;
+	vertical-align: text-top;
+}
+
+.widefat td {
+	padding: 7px 7px 5px;
+	vertical-align: top;
+}
+
+.widefat thead tr th:first {
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-khtml-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+}
+
+.widefat thead tr th:last {
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-khtml-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+}
+
+.widefat tfoot tr th:first {
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-khtml-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+}
+
+.widefat tfoot tr th:last {
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-khtml-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+}
+
+.widefat td p {
+	font-size: 11px;
+}
+
+.widefat th {
+	padding: 7px 7px 8px;
+	text-align: left;
+	line-height: 1.3em;
+}
+
+.widefat th input {
+	margin: 0 0 0 8px;
+	padding: 0;
+	vertical-align: text-top;
+}
+
+.widefat .check-column {
+	width: 2.2em;
+	padding: 0;
+
+}
+
+.widefat tbody th.check-column {
+	padding: 7px 0 22px;
+}
+
+.widefat .num,
+.column-comments,
+.column-links,
+.column-posts,
+.column-parent {
+	text-align: center;
+}
+
+.widefat th#comments {
+	vertical-align: middle;
+}
+
+.wrap {
+	margin: 0 15px 0 5px;
+}
+
+.updated,
+.error {
+	border-width: 1px;
+	border-style: solid;
+	padding: 0 0.6em;
+	margin: 5px 15px 2px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.updated p,
+.error p {
+	margin: 0.5em 0;
+	line-height: 1;
+	padding: 2px;
+}
+
+.wrap .updated,
+.wrap .error {
+	margin: 5px 0;
+}
+
+.wrap h2 {
+	font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	margin: 0;
+	padding: 14px 15px 3px 0;
+	line-height: 35px;
+	text-shadow: rgba(255,255,255,1) 0px 1px 0px;
+}
+
+.wrap h2.long-header {
+	padding-right: 0;
+}
diff -uNr a/mp-wp/wp-admin/css/ie-rtl.css b/mp-wp/wp-admin/css/ie-rtl.css
--- a/mp-wp/wp-admin/css/ie-rtl.css false
+++ b/mp-wp/wp-admin/css/ie-rtl.css 19a98ff73e515e96ae632cb332aa29ae902f3b255bc5300373eed1c6d384071a7b56c520c358e1d556b4f499d4d3a25bace037fc535e7a3847054921490c3b43
@@ -0,0 +1,91 @@
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px;
+}
+* html #adminmenu {
+	margin-left:0;
+	margin-right: -80px;
+}
+* html div.folded #adminmenu {
+	margin-left: 0;
+	margin-right: -22px;
+}
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+	padding: 3px 10px 4px 4px;
+}
+.inline-edit-row fieldset label span.title {
+	float: right;
+}
+.inline-edit-row fieldset label span.input-text-wrap {
+	margin-right: 0;
+}
+p.search-box {
+	float: left;
+}
+* html #poststuff h2 {
+	margin-right: 0;
+}
+#bh {
+	margin: 7px 10px 0 0;
+	float: left;
+}
+#user_info + div#favorite-actions {
+	right: auto;
+	left: 15px;
+}
+#wphead-info {
+	float: left;
+}
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+	padding-right: 0;
+	padding-left: 1px;
+}
+#tagchecklist span a {
+	margin: 4px -9px 0 0;
+}
+.widefat th input {
+	margin: 0 5px 0 0;
+}
+/* ---------- add by navid */
+#TB_window {
+	width: 670px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-right: 335px !important;
+}
+#dashboard_plugins {
+	direction: ltr;
+}
+#dashboard_plugins h3.hndle {
+	direction: rtl;
+}
+#dashboard_incoming_links ul li,
+#dashboard_secondary ul li,
+#dashboard_primary ul li,
+p.row-actions {
+	width: 100%;
+}
+#favorite-inside {
+	position: absolute;
+	right:0;
+}
+#post-status-info {
+	height: 25px;
+}
+#screen-meta {
+	position: static;
+}
+p.submit { /* quick edit and reply in edit-comments.php */
+	height:22px;
+}
+.inner-sidebar { /* fix edit single comment */
+	position: static;
+}
+form#widgets-filter { /* fix widget page */
+	position: static;
+}
diff -uNr a/mp-wp/wp-admin/css/ie.css b/mp-wp/wp-admin/css/ie.css
--- a/mp-wp/wp-admin/css/ie.css false
+++ b/mp-wp/wp-admin/css/ie.css e2a3e14c054c6b331693b00e210872b575bbe86aa602bf3210b231f36e1e9977a4c37e766c1ed1da3afe2454eebadae313c01fa0a87a33cba4adc5c77fafb439
@@ -0,0 +1,344 @@
+/* Fixes for IE bugs */
+
+input.button,
+input.button-secondary,
+input.button-highlighted {
+	padding: 0;
+}
+
+#minor-publishing-actions input,
+#major-publishing-actions input,
+#minor-publishing-actions .preview {
+	min-width: auto;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+#wpbody-content .postbox {
+	border: 1px solid #dfdfdf;
+}
+
+#wpbody-content .postbox h3 {
+	margin-bottom: -1px;
+}
+
+* html #side-info-column {
+	height: auto;
+}
+
+* html #wpbody-content #screen-options-link-wrap {
+	display: inline-block;
+	width: 150px;
+	text-align: center;
+}
+
+* html #wpbody-content #contextual-help-link-wrap {
+	display: inline-block;
+	width: 100px;
+	text-align: center;
+}
+
+/*
+* html body.minwidth {
+	_width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
+}
+
+* html #wpbody {
+	_width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%");
+}
+*/
+
+* html #adminmenu {
+	margin-left: -80px;
+}
+
+* html div.folded #adminmenu {
+	margin-left: -22px;
+}
+
+* html #wpcontent #adminmenu li.menu-top {
+	display: inline;
+	padding: 0;
+	margin: 0;
+}
+
+#wpcontent.folded #adminmenu li.menu-top {
+	display: block;
+}
+
+ul#adminmenu {
+	z-index: 99;
+}
+
+#adminmenu li.menu-top a.menu-top {
+	min-width: auto;
+	width: auto;
+}
+
+#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	font-style: normal;
+}
+
+* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
+	background: none;
+}
+
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif) no-repeat scroll left -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif) no-repeat scroll left -206px;
+}
+
+* html #adminmenu div.wp-menu-image {
+	height: 29px;
+}
+
+#wpcontent #adminmenu .wp-submenu li {
+	padding: 0;
+}
+
+#adminmenu,
+.wp-submenu,
+.wp-submenu li,
+.wp-menu-toggle {
+	zoom: 100%;
+}
+
+#wpcontent.folded #adminmenu li.wp-menu-separator {
+	width: 28px;
+}
+
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+	padding: 3px 4px 4px 10px;
+	zoom: 100%;
+}
+
+#wpcontent.folded #adminmenu .menu-top {
+	height: 30px;
+}
+
+.folded #adminmenu .wp-submenu {
+	margin: -1px 0 0 0;
+}
+
+#template,
+#template div,
+#editcat,
+#addcat {
+	zoom: 100%;
+}
+
+.submitbox {
+	margin-top: 10px;
+}
+
+/* Inline Editor */
+#wpbody-content .quick-edit-row-post .inline-edit-col-left {
+	width: 39%;
+}
+
+#wpbody-content .inline-edit-row-post .inline-edit-col-center {
+	width: 19%;
+}
+
+#wpbody-content .quick-edit-row-page .inline-edit-col-left {
+	width: 49%;
+}
+
+#wpbody-content .bulk-edit-row .inline-edit-col-left {
+	width: 29%;
+}
+
+.inline-edit-row p.submit {
+	zoom: 100%;
+}
+
+.inline-edit-row fieldset label span.title {
+	display: block;
+	float: left;
+	width: 5em;
+}
+
+.inline-edit-row fieldset label span.input-text-wrap {
+	margin-left: 0;
+	zoom: 100%;
+}
+
+#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
+	line-height: 130%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input {
+	width: 95%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input {
+	width: 8em;
+}
+/* end Inline Editor */
+
+* html .row-actions {
+	visibility: visible;
+}
+
+#dashboard-widgets h3 a {
+	height: 20px;
+	line-height: 20px;
+}
+
+#the-comment-list .comment-item,
+ul#widget-list li.widget-list-item {
+	zoom: 100%;
+}
+
+#wphead-info {
+	float: right;
+}
+
+#titlediv #title {
+	width: 98%;
+}
+
+a.button {
+	line-height: 1.4em;
+	margin: 1px;
+}
+
+* html div.widget-liquid-left-holder,
+* html div.widget-liquid-right {
+	display: block;
+	position: relative;
+}
+
+#screen-options-wrap {
+	overflow: hidden;
+}
+
+#favorite-actions {
+	z-index: 12;
+}
+
+#favorite-inside,
+#favorite-inside a,
+.favorite-action {
+	zoom: 100%;
+}
+
+#post-status-info,
+#wpwrap,
+#wpcontent,
+#post,
+#wrap,
+#postdivrich,
+#postdiv,
+#poststuff,
+.metabox-holder,
+#titlediv,
+#post-body,
+#editorcontainer,
+.tablenav,
+.widget-control-list,
+li.widget-list-control-item,
+#dragHelper,
+li.widget-list-control-item h4,
+.widget-sortable,
+.widget-control-actions,
+#tagchecklist,
+#col-container,
+#col-left,
+#col-right {
+	display: block;
+	zoom: 100%;
+}
+
+p.search-box {
+	position: static;
+	float: right;
+	margin: -3px 0 4px;
+}
+
+* html #editorcontainer {
+	padding: 0;
+}
+
+#editorcontainer #content {
+	overflow: auto;
+	margin: auto;
+	width: 98%;
+}
+
+form#template div {
+	width: 100%;
+}
+
+#ed_toolbar input {
+	overflow: visible;
+	padding: 0 4px;
+}
+
+#poststuff h2 {
+	font-size: 1.6em;
+}
+
+* html #poststuff h2 {
+	margin-left: 0;
+}
+
+#bh {
+	margin: 7px 10px 0 0;
+	float: right;
+}
+
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+	padding-right: 1px;
+}
+
+#tagchecklist span, #tagchecklist span a {
+	display: inline-block;
+	display: block;
+}
+
+#tagchecklist span a {
+	margin: 4px 0 0 -9px;
+}
+
+.tablenav .button-secondary, .nav .button-secondary {
+	padding: 0 1px;
+	vertical-align: middle;
+}
+
+.tablenav select {
+	font-size: 13px;
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 2px;
+}
+
+table.ie-fixed {
+	table-layout: fixed;
+}
+
+.widefat tr, .widefat th {
+	margin-bottom: 0;
+	border-spacing: 0;
+}
+
+.widefat th input {
+	margin: 0 0 0 5px;
+}
+
+.widefat .check-column {
+	padding: 6px 0 2px;
+}
+
+.widefat tbody th.check-column {
+	padding: 4px 0 22px;
+}
+
+.tablenav a.button-secondary {
+	display: inline-block;
+	padding: 2px 5px;
+}
diff -uNr a/mp-wp/wp-admin/css/install-rtl.css b/mp-wp/wp-admin/css/install-rtl.css
--- a/mp-wp/wp-admin/css/install-rtl.css false
+++ b/mp-wp/wp-admin/css/install-rtl.css 5c585c14f0c2ea87ed1ecefabbfafdcd94d30af1d2f4c60c0d1028da88439b9c743c66f93b1ae0581b4f78163e680d5cecf1f54074787b7ce4ae7c191e871f18
@@ -0,0 +1,16 @@
+body {
+	font-family: Tahoma, arial;
+}
+h1 {
+	font-family: arial;
+	margin: 5px -4px 0 0;
+}
+ul, ol { padding: 5px 22px 5px 5px; }
+.step, th { text-align: right; }
+.submit input, .button, .button-secondary {
+	font-family: Tahoma, arial;
+	margin-right:0;
+}
+.form-table th {
+	text-align: right;
+}
diff -uNr a/mp-wp/wp-admin/css/install.css b/mp-wp/wp-admin/css/install.css
--- a/mp-wp/wp-admin/css/install.css false
+++ b/mp-wp/wp-admin/css/install.css aa534208439b564c27f5556bd7bf7333a03c707504a0f2e39750819829cf466eca92b7990e3780eec2ad233f7c6ce22329d0e23873d6fc497d7c5286441f4215
@@ -0,0 +1,133 @@
+html { background: #f7f7f7; }
+
+body {
+	background: #fff;
+	color: #333;
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	margin: 2em auto 0 auto;
+	width: 700px;
+	padding: 1em 2em;
+	-moz-border-radius: 11px;
+	-khtml-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 11px;
+	border: 1px solid #dfdfdf;
+}
+
+a { color: #2583ad; text-decoration: none; }
+
+a:hover { color: #d54e21; }
+
+h1 {
+	border-bottom: 1px solid #dadada;
+	clear: both;
+	color: #666;
+	font: 24px Georgia, "Times New Roman", Times, serif;
+	margin: 5px 0 0 -4px;
+	padding: 0;
+	padding-bottom: 7px;
+}
+
+h2 { font-size: 16px; }
+
+p, li {
+	padding-bottom: 2px;
+	font-size: 12px;
+	line-height: 18px;
+}
+
+code { font-size: 13px; }
+
+ul, ol { padding: 5px 5px 5px 22px; }
+
+#logo { margin: 6px 0 14px 0; border-bottom: none;}
+
+.step {
+	margin: 20px 0 15px;
+}
+
+.step, th { text-align: left; padding: 0; }
+
+.submit input, .button, .button-secondary {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	text-decoration: none;
+	font-size: 14px !important;
+	line-height: 16px;
+	padding: 6px 12px;
+	cursor: pointer;
+	border: 1px solid #bbb;
+	color: #464646;
+	-moz-border-radius: 15px;
+	-khtml-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	border-radius: 15px;
+	-moz-box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+	-khtml-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+.button:hover, .button-secondary:hover, .submit input:hover {
+	color: #000;
+	border-color: #666;
+}
+
+.button, .submit input, .button-secondary {
+	background: #f2f2f2 url(../images/white-grad.png.svg) repeat-x scroll left top;
+}
+
+.button:active, .submit input:active, .button-secondary:active {
+	background: #eee url(../images/white-grad-active.png.svg) repeat-x scroll left top;
+}
+
+.form-table {
+	border-collapse: collapse;
+	margin-top: 1em;
+	width: 100%;
+}
+
+.form-table td {
+	margin-bottom: 9px;
+	padding: 10px;
+	border-bottom: 8px solid #fff;
+	font-size: 12px;
+}
+
+.form-table th {
+	font-size: 13px;
+	text-align: left;
+	padding: 16px 10px 10px 10px;
+	border-bottom: 8px solid #fff;
+	width: 110px;
+	vertical-align: top;
+}
+
+.form-table tr {
+	background: #f3f3f3;
+}
+
+.form-table code {
+	line-height: 18px;
+	font-size: 18px;
+}
+
+.form-table p {
+	margin: 4px 0 0 0;
+	font-size: 11px;
+}
+
+.form-table input {
+	line-height: 20px;
+	font-size: 15px;
+	padding: 2px;
+}
+
+#error-page { margin-top: 50px; }
+
+#error-page p {
+	font-size: 12px;
+	line-height: 18px;
+	margin: 25px 0 20px;
+}
+
+#error-page code { font-family: Consolas, Monaco, Courier, monospace; }
diff -uNr a/mp-wp/wp-admin/css/login-rtl.css b/mp-wp/wp-admin/css/login-rtl.css
--- a/mp-wp/wp-admin/css/login-rtl.css false
+++ b/mp-wp/wp-admin/css/login-rtl.css fe30aa78b15cca883b16f976d0ac0082d27b4476faaa9e2a564a846b5e74ee4a2c6845f34d0d6fc356a9a5b8572cb41d0d41df4646adbbdfd70dc6b8c21c7ae1
@@ -0,0 +1,30 @@
+body {
+	font-family: Tahoma, arial;
+}
+form {
+	margin-right: 8px;
+	margin-left: 0;
+}
+form .forgetmenot {
+	float: right;
+}
+#login form .submit input {
+	font-family: Tahoma, arial;
+}
+form .submit { float: left; }
+#backtoblog a {
+	left: auto;
+	right: 15px;
+}
+#login_error, .message {
+	margin: 0 8px 16px 0;
+}
+#nav { margin: 0 8px 0 0; }
+#user_pass, #user_login, #user_email {
+	margin-left: 6px;
+	margin-right: 0;
+	direction:ltr;
+}
+h1 a {
+	text-decoration: none;
+}
diff -uNr a/mp-wp/wp-admin/css/login.css b/mp-wp/wp-admin/css/login.css
--- a/mp-wp/wp-admin/css/login.css false
+++ b/mp-wp/wp-admin/css/login.css 0e5a3c515e7a8c2a9ebab9b501a7352e548987af5b091e6aa3a896dbcb926c69b807d766f05176ca9242c0b9d905e9e7a61027a6c7aa2a50b29db23c768cc9f6
@@ -0,0 +1,107 @@
+* { margin: 0; padding: 0; }
+
+body {
+	border-top-width: 30px;
+	border-top-style: solid;
+	font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+form {
+	margin-left: 8px;
+	padding: 16px 16px 40px 16px;
+	font-weight: normal;
+	-moz-border-radius: 11px;
+	-khtml-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 5px;
+	background: #fff;
+	border: 1px solid #e5e5e5;
+	-moz-box-shadow: rgba(200,200,200,1) 0 4px 18px;
+	-webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px;
+	-khtml-box-shadow: rgba(200,200,200,1) 0 4px 18px;
+	box-shadow: rgba(200,200,200,1) 0 4px 18px;
+}
+
+form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0; }
+
+#login form .submit input {
+	font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+	padding: 3px 10px;
+	border: none;
+	font-size: 12px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 11px;
+	-khtml-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 11px;
+	cursor: pointer;
+	text-decoration: none;
+	margin-top: -3px;
+	text-shadow: rgba(0,0,0,0.3) 0 -1px 0;
+}
+
+#login form p {
+	margin-bottom: 0;
+}
+
+label {
+	color: #777;
+	font-size: 13px;
+}
+
+form .forgetmenot label {
+	font-size: 11px;
+	line-height: 19px;
+}
+
+form .submit { float: right; }
+
+form p { margin-bottom: 24px; }
+
+h1 a {
+	background: url(../images/logo-login.gif) no-repeat top center;
+	width: 326px;
+	height: 67px;
+	text-indent: -9999px;
+	overflow: hidden;
+	padding-bottom: 15px;
+	display: block;
+}
+
+#nav {
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+#backtoblog a {
+	position: absolute;
+	top: 7px;
+	left: 15px;
+	text-decoration: none;
+}
+
+#login { width: 320px; margin: 7em auto; }
+
+#login_error, .message {
+	margin: 0 0 16px 8px;
+	border-width: 1px;
+	border-style: solid;
+	padding: 12px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#nav { margin: 0 0 0 8px; padding: 16px; }
+
+#user_pass, #user_login, #user_email {
+	font-size: 24px;
+	width: 97%;
+	padding: 3px;
+	margin-top: 2px;
+	margin-right: 6px;
+	margin-bottom: 16px;
+	border: 1px solid #e5e5e5;
+	background: #fbfbfb;
+}
diff -uNr a/mp-wp/wp-admin/css/media-rtl.css b/mp-wp/wp-admin/css/media-rtl.css
--- a/mp-wp/wp-admin/css/media-rtl.css false
+++ b/mp-wp/wp-admin/css/media-rtl.css 706c8cfd052de05246f11d5a5b55da423f15e6270c5f6b1c5008b01bb8672e32bad1068faafe1d2146e68f70a40c29d581f35d2059d4be0a3943397f998b26ae
@@ -0,0 +1,93 @@
+body#media-upload ul#sidemenu {
+	left: auto;
+	right: 0;
+}
+#search-filter {
+	text-align: left;
+}
+/* specific to the image upload form */
+.align .field label {
+	padding: 0 28px 0 0;
+	margin: 0 0 0 1em;
+}
+.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
+	background-position: center right;
+}
+tr.image-size div.image-size-item {
+	float: right;
+}
+tr.image-size label {
+	margin: 0 1em 0 0;
+}
+.filename.original {
+	float: right;
+}
+.crunching {
+	text-align: left;
+	margin-right: 0;
+	margin-left: 5px;
+}
+button.dismiss {
+	right: auto;
+	left: 5px;
+}
+.file-error {
+	margin: 0 50px 5px 0;
+}
+.progress {
+	left: auto;
+	right: 0;
+}
+.describe td {
+	padding: 0 0 0 5px;
+}
+.bar {
+	border-right-width: 0;
+	border-left-width: 3px;
+	border-right-style: none;
+	border-left-style: solid;
+}
+.media-item .pinkynail {
+	float: right;
+}
+.describe-toggle-on,
+.describe-toggle-off {
+	float: left;
+	margin-right: 0;
+	margin-left: 20px;
+}
+/* Specific to Uploader */
+#media-upload .media-upload-form p {
+	margin: 0 0 1em 1em;
+}
+.filename {
+	float: right;
+	margin-left: 0;
+	margin-right: 10px;
+}
+#media-upload .describe th.label {
+	text-align: right;
+}
+.menu_order {
+	float: left;
+}
+.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
+	font-family: Tahoma, Arial;
+}
+#gallery-settings #basic th.label {
+	padding: 5px 0 5px 5px;
+}
+#gallery-settings .title, h3.media-title {
+	font-family: Tahoma, Arial;
+}
+#gallery-settings .describe th.label {
+	text-align: right;
+}
+#gallery-settings label,
+#gallery-settings legend {
+	margin-right: 0;
+	margin-left: 15px;
+}
+#gallery-settings .align .field label {
+	margin: 0 0 0 1.5em;
+}
diff -uNr a/mp-wp/wp-admin/css/media.css b/mp-wp/wp-admin/css/media.css
--- a/mp-wp/wp-admin/css/media.css false
+++ b/mp-wp/wp-admin/css/media.css c3c7bab1244b94280a1e8560875a5f757ca8cb3e152da0312ae3c9b5cc0c0f04a1224c33a7865ae17feedfbf33b8c521b77a363b9cc67f984fc976fadbb0f2d0
@@ -0,0 +1,426 @@
+div#media-upload-header {
+	margin: 0;
+	padding: 0 5px;
+	font-weight: bold;
+	position: relative;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	height: 2.5em;
+}
+
+body#media-upload ul#sidemenu {
+	font-weight: normal;
+	margin: 0 5px;
+	position: absolute;
+	left: 0px;
+	bottom: -1px;
+}
+
+div#media-upload-error {
+	margin: 1em;
+	font-weight: bold;
+}
+
+form {
+	margin: 1em;
+}
+
+#search-filter {
+	text-align: right;
+}
+
+.media-upload-form label,
+.media-upload-form legend {
+	display: block;
+	font-weight: bold;
+	font-size: 13px;
+	margin-bottom: 0.5em;
+	margin: 0 0 0.5em 0;
+}
+
+th {
+	position: relative;
+}
+
+.media-upload-form label.form-help, td.help {
+	font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+	font-style: italic;
+	font-weight: normal;
+}
+
+.media-upload-form p.help {
+	margin: 0;
+	padding: 0;
+}
+
+.media-upload-form fieldset {
+	width: 100%;
+	border: none;
+	text-align: justify;
+	margin: 0 0 1em 0;
+	padding: 0;
+}
+
+/* specific to the image upload form */
+.align .field label {
+	display: inline;
+	padding: 0 0 0 28px;
+	margin: 0 1em 0 0;
+}
+
+.image-align-none-label {
+	background: url(../images/align-none.png.svg) no-repeat center left;
+}
+
+.image-align-left-label {
+	background: url(../images/align-left.png.svg) no-repeat center left;
+}
+
+.image-align-center-label {
+	background: url(../images/align-center.png.svg) no-repeat center left;
+}
+
+.image-align-right-label {
+	background: url(../images/align-right.png.svg) no-repeat center left;
+}
+
+tr.image-size td {
+	width: 460px;
+}
+
+tr.image-size div.image-size-item {
+	float: left;
+	width: 25%;
+	margin: 0;
+}
+
+tr.image-size label {
+	display: inline;
+	margin: 0 0 0 1em;
+}
+
+.pinkynail {
+	max-width: 40px;
+	max-height: 40px;
+}
+
+.filename.original {
+	float: left;
+}
+
+.crunching {
+	display: block;
+	line-height: 32px;
+	text-align: right;
+	margin-right: 5px;
+}
+
+button.dismiss {
+	position: absolute;
+	top: 7px;
+	right: 5px;
+	z-index: 4;
+	width: 8em;
+}
+
+.file-error {
+	float: left;
+	font-weight: bold;
+	padding: 10px;
+}
+
+.progress {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 623px;
+	height: 36px;
+}
+
+.bar {
+	width: 0;
+	height: 100%;
+	border-right-width: 3px;
+	border-right-style: solid;
+}
+
+#library-form .progress,
+#gallery-form .progress,
+#flash-upload-ui,
+.insert-gallery,
+.describe.startopen,
+.describe.startclosed {
+	display: none;
+}
+
+.media-item .thumbnail {
+	max-width: 128px;
+	max-height: 128px;
+}
+
+.media-item .pinkynail {
+	float: left;
+	margin: 2px;
+	height: 32px;
+	max-width: 40px;
+}
+
+thead.media-item-info tr {
+	background-color: transparent;
+}
+
+thead.media-item-info th,
+thead.media-item-info td {
+	border: none;
+	margin: 0;
+}
+
+.form-table thead.media-item-info {
+	border: 8px solid #fff;
+}
+
+abbr.required {
+	text-decoration: none;
+	border: none;
+}
+
+.describe label {
+	display: inline;
+}
+
+.describe td {
+	vertical-align: middle;
+	padding: 0 5px 0 0;
+}
+
+.describe td.A1 {
+	width: 132px;
+}
+
+.describe input[type="text"],
+.describe textarea {
+	width: 460px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+.describe-toggle-on,
+.describe-toggle-off {
+	display: block;
+	line-height: 36px;
+	float: right;
+	margin-right: 20px;
+}
+
+.describe-toggle-off {
+	display: none;
+}
+
+.hidden {
+	height: 0;
+	width: 0;
+	overflow: hidden;
+	border: none;
+}
+
+/* Specific to Uploader */
+
+#media-upload .media-upload-form p {
+	margin: 0 1em 1em 0;
+}
+
+#media-upload .media-upload-form p.ml-submit {
+	padding: 1em 0;
+}
+
+#media-upload p.help,
+#media-upload label.help {
+	font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+	font-style: italic;
+	font-weight: normal;
+}
+
+#media-upload tr.image-size td.field {
+	text-align: center;
+}
+
+#media-upload #media-items {
+	border-width: 1px;
+	border-style: solid;
+	border-bottom: none;
+	width: 623px;
+}
+
+#media-upload .media-item {
+	position: relative;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	min-height: 36px;
+	width: 100%;
+}
+
+#media-upload .ui-sortable .media-item {
+	cursor: move;
+}
+
+.filename {
+	float: left;
+	line-height: 36px;
+	margin-left: 10px;
+	overflow: hidden;
+	max-width: 430px;
+}
+
+#media-upload .describe {
+	padding: 5px;
+	width: 100%;
+	clear: both;
+	cursor: default;
+}
+
+#media-upload .slidetoggle {
+	border-top-width: 1px;
+	border-top-style: solid;
+}
+
+#media-upload .describe th.label {
+	padding-top: .5em;
+	text-align: left;
+	min-width: 120px;
+}
+
+#media-upload tr.align td.field {
+	text-align: center;
+}
+
+#media-upload tr.image-size {
+	margin-bottom: 1em;
+	height: 3em;
+}
+
+#media-upload #filter {
+	width: 623px;
+}
+
+#media-upload #filter .subsubsub {
+	margin: 8px 0;
+}
+
+#filter .tablenav select {
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px;
+	vertical-align: top;
+	width: auto;
+}
+
+#media-upload a.delete,
+#media-upload a.del-link {
+	padding: 0 3px 1px;
+}
+
+#media-upload .del-attachment {
+	display: none;
+	margin: 5px 0;
+}
+
+.menu_order {
+	float: right;
+	font-size: 11px;
+	margin: 10px 10px 0;
+}
+
+.menu_order_input {
+	border: 1px solid #ddd;
+	font-size: 10px;
+	padding: 1px;
+	width: 23px;
+}
+
+.ui-sortable-helper {
+	background-color: #fff;
+	border: 1px solid #aaa;
+	opacity: 0.6;
+	filter: alpha(opacity=60);
+}
+
+#media-upload th.order-head {
+	width: 25%;
+	text-align: center;
+}
+
+#media-upload .widefat {
+	width: 626px;
+	border-style: solid solid none;
+}
+
+.sorthelper {
+	z-index: -1;
+}
+
+#gallery-settings th.label {
+	width: 160px;
+}
+
+#gallery-settings #basic th.label {
+	padding: 5px 5px 5px 0;
+}
+
+#gallery-settings .title {
+	clear: both;
+	padding: 0 0 3px;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	font-family: Georgia,"Times New Roman",Times,serif;
+	font-size: 1.6em;
+	border-bottom-color: #DADADA;
+	color: #5A5A5A;
+}
+
+h3.media-title  {
+	color: #5A5A5A;
+	font-family: Georgia,"Times New Roman",Times,serif;
+	font-size: 1.6em;
+	font-weight: normal;
+}
+
+#gallery-settings .describe td {
+	vertical-align: middle;
+	height: 3.5em;
+}
+
+#gallery-settings .describe th.label {
+	padding-top: .5em;
+	text-align: left;
+}
+
+#gallery-settings .describe {
+	padding: 5px;
+	width: 615px;
+	clear: both;
+	cursor: default;
+}
+
+#gallery-settings .describe select {
+	width: 15em;
+	border: 1px solid #dfdfdf;
+}
+
+#gallery-settings label,
+#gallery-settings legend {
+	font-size: 13px;
+	color: #464646;
+	margin-right: 15px;
+}
+
+#gallery-settings .align .field label {
+	margin: 0 1.5em 0 0;
+}
+
+#gallery-settings p.ml-submit {
+	border-top: 1px solid #dfdfdf;
+}
+
+#gallery-settings select#columns {
+	width: 6em;
+}
diff -uNr a/mp-wp/wp-admin/css/plugin-install-rtl.css b/mp-wp/wp-admin/css/plugin-install-rtl.css
--- a/mp-wp/wp-admin/css/plugin-install-rtl.css false
+++ b/mp-wp/wp-admin/css/plugin-install-rtl.css e41b4dec130277f1105cacf9669cd3208b49d45809aa990737388768a85a4fe83482512fc78cec16f3cc222f29c7a3f367469c25cfc2bfd5098597070bd91391
@@ -0,0 +1,43 @@
+div.star {
+	left: auto;
+	right: 0;
+	letter-spacing: 0;
+}
+.star img, div.star a, div.star a:hover, div.star a:visited {
+	right: auto;
+	left: 0;
+}
+#plugin-information ul#sidemenu {
+	left: auto;
+	right: 0;
+}
+#plugin-information h2 {
+	margin-right: 0;
+	margin-left: 200px;
+}
+#plugin-information .fyi {
+	margin-left: 5px;
+	margin-right: 20px;
+}
+#plugin-information .fyi h2 {
+	margin-left: 0;
+}
+#plugin-information .fyi ul {
+	padding: 10px 7px 10px 5px;
+}
+#plugin-information #section-screenshots li p {
+	padding-left: 0;
+	padding-right: 20px;
+}
+#plugin-information .updated,
+#plugin-information pre {
+	margin-right: 0;
+	margin-left: 215px;
+}
+#plugin-information .updated, #plugin-information .error {
+	clear: none;
+	direction: rtl;
+}
+#section-description {
+	direction: ltr;
+}
diff -uNr a/mp-wp/wp-admin/css/plugin-install.css b/mp-wp/wp-admin/css/plugin-install.css
--- a/mp-wp/wp-admin/css/plugin-install.css false
+++ b/mp-wp/wp-admin/css/plugin-install.css 71b90176bf4774f8f41e8c6a3e771d4aaa2b2250665e8eb702e33792f1ec90843696ae39b33eddc0233a52368d38dcf3943b68555fbcef151f97c1b980a3ca7c
@@ -0,0 +1,149 @@
+/* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
+div.star-holder {
+	position: relative;
+	height: 19px;
+	width: 100px;
+	font-size: 19px;
+}
+
+div.star {
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: transparent;
+	letter-spacing: 1ex;
+	border: none;
+}
+
+.star1 { width: 20%; }
+.star2 { width: 40%; }
+.star3 { width: 60%; }
+.star4 { width: 80%; }
+.star5 { width: 100%; }
+
+.star img, div.star a, div.star a:hover, div.star a:visited {
+	display: block;
+	position: absolute;
+	right: 0;
+	border: none;
+	text-decoration: none;
+}
+
+div.star img {
+	width: 19px;
+	height: 19px;
+	border-left: 1px solid #fff;
+	border-right: 1px solid #fff;
+}
+
+/* Start custom CSS */
+/* Header on thickbox */
+#plugin-information-header {
+	margin: 0;
+	padding: 0 5px;
+	font-weight: bold;
+	position: relative;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	height: 2.5em;
+}
+#plugin-information ul#sidemenu {
+	font-weight: normal;
+	margin: 0 5px;
+	position: absolute;
+	left: 0;
+	bottom: -1px;
+}
+
+/* Install sidemenu */
+#plugin-information p.action-button {
+	width: 100%;
+	padding-bottom: 0;
+	margin-bottom: 0;
+	margin-top: 10px;
+	-moz-border-radius: 3px 0 0 3px;
+	-webkit-border-top-left-radius: 3px;
+	-khtml-border-top-left-radius: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-khtml-border-bottom-left-radius: 3px;
+	border-top-bottom-radius: 3px;
+}
+
+#plugin-information .action-button a {
+	text-align: center;
+	font-weight: bold;
+	text-decoration: none;
+	display: block;
+	line-height: 2em;
+}
+
+#plugin-information h2 {
+	clear: none !important;
+	margin-right: 200px;
+}
+
+#plugin-information .fyi {
+	margin-left: 10px;
+	margin-bottom: 50px;
+	width: 210px;
+}
+
+#plugin-information .fyi h2 {
+	font-size: 0.9em;
+	margin-bottom: 0;
+	margin-right: 0;
+}
+
+#plugin-information .fyi h2.mainheader {
+	padding: 5px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-left-radius: 3px;
+	-khtml-border-top-left-radius: 3px;
+	border-top-left-radius: 3px;
+}
+
+#plugin-information .fyi ul {
+	padding: 10px 5px 10px 7px;
+	margin: 0;
+	list-style: none;
+	-moz-border-radius-bottomleft: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-khtml-border-bottom-left-radius: 3px;
+	border-top-bottom-radius: 3px;
+}
+
+#plugin-information .fyi li {
+	margin-right: 0;
+}
+
+#plugin-information #section-holder {
+	padding: 10px;
+}
+
+#plugin-information .section ul,
+#plugin-information .section ol {
+	margin-left: 16px;
+	list-style-type: square;
+	list-style-image: none;
+}
+
+#plugin-information #section-screenshots li img {
+	vertical-align: text-top;
+}
+
+#plugin-information #section-screenshots li p {
+	font-style: italic;
+	padding-left: 20px;
+	padding-bottom: 2em;
+}
+
+#plugin-information .updated,
+#plugin-information pre {
+	margin-right: 215px;
+}
+
+#plugin-information pre {
+	padding: 7px;
+}
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/css/press-this-rtl.css b/mp-wp/wp-admin/css/press-this-rtl.css
--- a/mp-wp/wp-admin/css/press-this-rtl.css false
+++ b/mp-wp/wp-admin/css/press-this-rtl.css a612e90d94ca1b65a1efe56b01d23770b32c9b1f0b268bfb22fba7b004002ab3d26eddb4ae3af38678852d74d82c2ee5edd7dc2321f48e0e820a5635ea2d1260
@@ -0,0 +1,106 @@
+body {
+	font-family: Tahoma, Arial;
+}
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	margin: 0px 0 0 5px;
+	float: right;
+}
+/* Editor/Main Column */
+div#poststuff {
+	padding-left: 0;
+	padding-right: 10px;
+}
+.posting {
+	margin-right: 0;
+	margin-left: 228px;
+	left:auto;
+	right: 0;
+}
+#side-info-column {
+	float: left;
+	right: auto;
+	left: 0;
+	margin-right: 0;
+	margin-left: 10px;
+}
+#side-info-column .sleeve {
+	padding-left: 0;
+	padding-right: 10px;
+}
+h3.tb {
+	margin-left: 0;
+	margin-right: 5px;
+}
+#actions {
+	float: left;
+}
+#extra_fields #actions {
+	right: auto;
+	left: 4px;
+}
+#actions li {
+	float: right;
+	margin-right: 0;
+	margin-left: 10px;
+}
+#extra_fields .button {
+	margin-right: 0;
+	margin-left: 5px;
+}
+/* Photo Styles */
+#img_container a {
+	float: right;
+}
+#category-add input, #category-add select {
+	font-family: Tahoma, Arial;
+}
+#categorydiv ul.categorychecklist ul {
+	margin-left: 0;
+	margin-right: 18px;
+}
+/* Tags */
+#tagsdiv #newtag {
+	margin-right: 0;
+	margin-left: 5px;
+}
+#tagadd {
+	margin-left: 0;
+	margin-right: 3px;
+}
+#tagchecklist span {
+	margin-left: .5em;
+	margin-right: 10px;
+	float: right;
+}
+#tagchecklist span a {
+	margin: 6px -9px 0 0;
+	float: right;
+}
+#content {
+	margin-left: 0;
+	margin-right: 1%;
+}
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	font-family: tahoma;
+}
+.ac_results li {
+	text-align: right;
+}
+#TB_ajaxContent #options {
+	right: auto;
+	left: 25px;
+}
+#post_status {
+	margin-left: 0;
+	margin-right: 10px;
+}
+/* Footer */
+#footer {
+	padding: 10px 60px 0 0;
+}
diff -uNr a/mp-wp/wp-admin/css/press-this.css b/mp-wp/wp-admin/css/press-this.css
--- a/mp-wp/wp-admin/css/press-this.css false
+++ b/mp-wp/wp-admin/css/press-this.css e412b019bb0e64594780a88145b84011ccbf0046ed11138294f43d5e31ff02259532eae58d67009eee91007c4754f2f5f71e1413181bab1196c347eab0e7566e
@@ -0,0 +1,571 @@
+body {
+	font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+	color: #333;
+	margin: 0;
+	padding: 0;
+}
+
+img {
+	border: none;
+}
+
+/* Header */
+#wphead {
+	border-top: none;
+	padding-top: 4px;
+	background: #444 !important;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+	-moz-border-radius-bottomleft: 0;
+	-moz-border-radius-bottomright: 0;
+	-moz-border-radius-topleft: 3px;
+	-moz-border-radius-topright: 3px;
+	-khtml-border-radius-bottomleft: 0;
+	-khtml-border-radius-bottomright: 0;
+	-khtml-border-radius-topleft: 3px;
+	-khtml-border-radius-topright: 3px;
+	-webkit-border-radius-bottomleft: 0;
+	-webkit-border-radius-bottomright: 0;
+	-webkit-border-radius-topleft: 3px;
+	-webkit-border-radius-topright: 3px;
+	border-radius-bottomleft: 0;
+	border-radius-bottomright: 0;
+	border-radius-topleft: 3px;
+	border-radius-topright: 3px;
+	border-style: solid;
+	border-width: 1px;
+	cursor: pointer;
+	display: block;
+	height: 18px;
+	margin: 0px 5px 0 0;
+	padding: 0px 5px 0px;
+	background-color: #E9E9E9;
+	border-bottom-color: #E9E9E9;
+	color: #333333;
+	font-size: 10px;
+	line-height: 18px;
+	float: left;
+}
+
+.howto {
+	margin-top: 2px;
+	margin-bottom: 3px;
+	font-size: 11px;
+	font-style: italic;
+	display: block;
+}
+
+input.text {
+	outline-color: -moz-use-text-color;
+	outline-style: none;
+	outline-width: medium;
+	width: 100%;
+}
+
+#message {
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+/* Editor/Main Column */
+div#poststuff {
+	padding-left: 10px;
+	margin-top: 10px;
+}
+
+div.zerosize {
+	border: 0 none;
+	height: 0;
+	margin: 0;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 0;
+}
+
+#poststuff #edButtonPreview.active,
+#poststuff #edButtonHTML.active {
+	display: none;
+}
+
+.posting {
+	margin-right: 228px;
+	position: relative;
+	left: 0;
+}
+
+#side-info-column {
+	float: right;
+	width: 218px;
+	position: absolute;
+	right: 0;
+	margin-right: 10px;
+}
+
+#side-info-column .sleeve {
+	padding-left: 10px;
+}
+
+#poststuff .inside {
+	font-size: 11px;
+	margin: 0 12px 12px;
+}
+
+#poststuff h2, #poststuff h3 {
+	font-size: 14px;
+	font-weight: bold;
+	padding: 7px;
+	margin: 0 0 10px;
+	background-image: url(../images/postbox-bg.gif.svg);
+	background-position: left top;
+	background-repeat: repeat-x;
+	font-size: 12px;
+	font-weight: bold;
+	line-height: 1;
+	margin: 0 0 10px;
+	padding: 7px 9px;
+	text-shadow: 0 1px 0 #FFFFFF;
+}
+
+h3.tb {
+	text-shadow: 0 1px 0 #FFFFFF;
+	font-weight: bold;
+	font-size: 12px;
+	margin-left: 5px;
+}
+
+#TB_window {
+	border: 1px solid #333;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+.metabox-holder .postbox,
+.postbox,
+.stuffbox {
+	margin-bottom: 10px;
+	border-width: 1px;
+	border-style: solid;
+	line-height: 1;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border-color: #DFDFDF;
+}
+
+.titlediv {
+	border-color: #DFDFDF;
+}
+
+#title, .tbtitle {
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border-style: solid;
+	border-width: 1px;
+	font-size: 1.7em;
+	outline: none;
+	padding: 3px 4px;
+	border-color: #DFDFDF;
+}
+
+.tbtitle {
+	font-size: 12px;
+	padding: 3px;
+}
+
+#title {
+	width: 98%;
+}
+
+.postbox h2 {
+	background-image: url(../images/postbox-bg.gif.svg);
+	background-position: left top;
+	background-repeat: repeat-x;
+	background-color: #DFDFDF;
+}
+
+.editor-container {
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border-collapse: separate;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #DFDFDF;
+}
+
+.postdivrich {
+	position: relative;
+	padding-top: 25px;
+}
+
+#actions {
+	clear: both;
+	float: right;
+	margin-top: -19px;
+	position: relative;
+}
+#extra_fields #actions {
+	clear: both;
+	position: absolute;
+	right: 4px;
+	top: 6px;
+	margin: 0;
+}
+
+#actions li {
+	float: left;
+	list-style: none;
+	margin-right: 10px;
+}
+#extra_fields .button {
+	margin-right: 5px;
+}
+
+/* Photo Styles */
+.photolist {
+	margin-top: -10px;
+}
+
+#photo_saving {
+	margin: 0 8px 8px;
+	vertical-align: middle;
+}
+
+#img_container {
+	background-color: #fff;
+	height: 101px;
+	width: 100%;
+}
+
+#extra_fields {
+	margin-top: 10px;
+	position: relative;
+}
+
+#extra_fields .postbox {
+	margin-bottom: 5px;
+}
+
+#extra_fields .titlewrap {
+	padding: 0;
+	overflow: auto;
+	height: 100px;
+}
+
+#img_container {
+	position: relative;
+}
+
+#img_container a {
+	display: block;
+	float: left;
+	overflow: hidden;
+	vertical-align: center;
+}
+
+#img_container img, #img_container a {
+	width: 68px;
+	height: 68px;
+}
+
+#img_container img {
+	width: 68px;
+	height: 68px;
+	border: none;
+	background-color: #f4f4f4;
+	cursor: pointer;
+}
+
+#img_container a,
+#img_container a:link,
+#img_container a:visited {
+	border: 1px solid #ccc;
+	display: block;
+	position: relative;
+}
+
+#img_container a:hover,
+#img_container a:active {
+	border-color: #000;
+	z-index: 1000;
+	border-width: 2px;
+	margin: -1px;
+}
+
+/* Video */
+#embed-code {
+	width: 100%;
+	height: 98px;
+}
+
+/* Submit Column */
+#viewsite {
+	padding: 0;
+	margin: 0 0 20px 0;
+	font-size: 10px;
+	clear: both;
+}
+
+#viewsite .button {
+	margin: 0 0 0px 0;
+	display: block;
+}
+
+.wp-hidden-children .wp-hidden-child {
+	display: none;
+}
+
+#category-adder {
+	padding: 4px 0;
+}
+
+#category-adder h4 {
+	margin: 0 0 8px;
+}
+
+#category-add input {
+	width: 94%;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	margin: 1px;
+	padding: 3px;
+}
+
+#category-add select {
+	width: 70%;
+	-x-system-font: none;
+	border-style: solid;
+	border-width: 1px;
+	font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+	font-size: 12px;
+	height: 2em;
+	line-height: 20px;
+	padding: 2px;
+	margin: 1px;
+	vertical-align: top;
+}
+
+#category-add input#category-add-sumbit {
+	width: auto;
+}
+
+/* Categories */
+#categorydiv ul, #linkcategorydiv ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+#categorydiv ul.categorychecklist ul {
+	margin-left: 18px;
+}
+
+#categorydiv div.ui-tabs-panel {
+	height: 150px;
+	overflow: auto;
+}
+
+ul.categorychecklist li {
+	margin: 0;
+	padding: 0;
+	line-height: 19px;
+}
+
+/* Tags */
+#tagsdiv #newtag {
+	padding: 3px;
+	margin-right: 5px;
+	width: 16em;
+}
+
+#jaxtag {
+	clear: both;
+	margin: 0;
+}
+
+#tagadd {
+	margin-left: 3px;
+}
+
+#tagchecklist {
+	margin-top: 3px;
+	margin-bottom: 1em;
+	font-size: 12px;
+	overflow: auto;
+}
+
+#tagchecklist strong {
+	position: absolute;
+	font-size: .75em;
+}
+
+#tagchecklist span {
+	margin-right: .5em;
+	margin-left: 10px;
+	display: block;
+	float: left;
+	font-size: 11px;
+	line-height: 1.8em;
+	white-space: nowrap;
+	cursor: default;
+}
+
+#tagchecklist span a {
+	margin: 6px 0 0 -9px;
+	cursor: pointer;
+	width: 10px;
+	height: 10px;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	position: absolute;
+}
+
+#content {
+	width: 96% !important;
+	margin-left: 1%;
+	margin-bottom: 10px;
+	border: 1px solid #f1f1f1;
+}
+
+/* Submit */
+
+#saving {
+	display: inline;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+	font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+	text-decoration: none;
+	font-size: 11px !important;
+	line-height: 16px;
+	padding: 2px 8px;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 11px;
+	-khtml-border-radius: 11px;
+	-webkit-border-radius: 11px;
+	border-radius: 11px;
+}
+
+.button-primary {
+	background: #21759B url(../images/button-grad.png.svg) repeat-x scroll left top;
+	border-color: #21759B;
+	color: #FFFFFF;
+}
+
+.ac_results {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	position: absolute;
+	z-index: 10000;
+	display: none;
+	border-width: 1px;
+	border-style: solid;
+}
+
+.ac_results li {
+	padding: 2px 5px;
+	white-space: nowrap;
+	text-align: left;
+}
+
+.ac_over {
+	cursor: pointer;
+}
+
+.ac_match {
+	text-decoration: underline;
+}
+
+#TB_ajaxContent #options {
+	position: absolute;
+	top: 20px;
+	right: 25px;
+	padding: 5px;
+}
+
+#TB_ajaxContent h3 {
+	margin-bottom: .25em;
+}
+
+.updated {
+	margin: 10px 0;
+	padding: 0;
+	border-width: 1px;
+	border-style: solid;
+	width: 99%;
+}
+
+.updated p,
+.error p {
+	margin: 0.6em 0;
+	padding: 0 0.6em;
+}
+
+.error a {
+	text-decoration: underline;
+}
+
+.updated a {
+	text-decoration: none;
+	padding-bottom: 2px;
+}
+
+#post_status {
+	margin-left: 10px;
+	margin-bottom: 1em;
+	display: block;
+}
+
+/* Footer */
+#footer {
+	height: 65px;
+	display: block;
+	width: 640px;
+	padding: 10px 0 0 60px;
+	margin: 0;
+	position: absolute;
+	bottom: 0;
+	font-size: 12px;
+}
+
+#footer p {
+	margin: 0;
+	padding: 7px 0;
+}
+
+#footer p a {
+	text-decoration: none;
+}
+#footer p a:hover {
+	text-decoration: underline;
+}
+
+/* Utility Classes */
+.centered {
+	text-align: center;
+}
+
+.hidden {
+	display: none;
+}
diff -uNr a/mp-wp/wp-admin/css/theme-editor-rtl.css b/mp-wp/wp-admin/css/theme-editor-rtl.css
--- a/mp-wp/wp-admin/css/theme-editor-rtl.css false
+++ b/mp-wp/wp-admin/css/theme-editor-rtl.css 713c562e77f6cec28cadcabfd626cb6972f66274bbc4ef99ec1252e1aa949026da1c893c51dc4c2b3eec99847bb8d488243a90008b6eb4325f868a721127c06a
@@ -0,0 +1,12 @@
+#templateside {
+	float: left;
+}
+#themeselector {
+	padding-right: 0;
+	padding-left: 5px;
+	float: left;
+}
+div.tablenav {
+	margin-right: 0;
+	margin-left: 210px;
+}
diff -uNr a/mp-wp/wp-admin/css/theme-editor.css b/mp-wp/wp-admin/css/theme-editor.css
--- a/mp-wp/wp-admin/css/theme-editor.css false
+++ b/mp-wp/wp-admin/css/theme-editor.css 706a65caed9197a30da7516cb77768a99b76dd9a1a194941cc95a9918454836b5cedd8181d0e281738118eb2f7342d568589437b653a560ac290aa1c29191ec9
@@ -0,0 +1,66 @@
+#template textarea {
+	font-family: Consolas, Monaco, Courier, monospace;
+	font-size: 12px;
+	width: 97%;
+}
+
+#template p {
+	width: 97%;
+}
+
+#templateside {
+	float: right;
+	width: 190px;
+}
+
+#templateside h3, #postcustomstuff p.submit {
+	margin: 0;
+}
+
+h3#bordertitle {
+	margin-bottom: 10px;
+}
+
+#templateside h4 {
+	margin-bottom: 0;
+}
+
+#templateside ol, #templateside ul {
+	list-style: none;
+	margin: .5em;
+	padding: 0;
+}
+
+#templateside ol li, #templateside ul li {
+	margin: 1px 0;
+}
+
+#themeselector {
+	padding-right: 5px;
+	float: right;
+	position: relative;
+	bottom: 25px;
+	top:20px;
+}
+
+#themeselector select {
+	margin: 0;
+	padding: 0;
+}
+
+.nonessential {
+	font-size: small;
+}
+
+.highlight {
+	padding: 1px;
+}
+
+div.bordertitle h2 {
+	border: none;
+	padding-bottom: 0;
+}
+
+div.tablenav {
+	margin-right: 210px;
+}
diff -uNr a/mp-wp/wp-admin/css/widgets-rtl.css b/mp-wp/wp-admin/css/widgets-rtl.css
--- a/mp-wp/wp-admin/css/widgets-rtl.css false
+++ b/mp-wp/wp-admin/css/widgets-rtl.css bc3af16194eebd59242e3e9f90e8b4d8792e051a36faf273095f861a132c3586040fb3b383cfe0a8aa5796c4bad49dee942c77929dd58391f232598ed8d6c315
@@ -0,0 +1,27 @@
+h4.widget-title span {
+	float: right;
+}
+h4.widget-title a {
+	float: left;
+	margin-left: 0;
+	margin-right: 1em;
+}
+ul#widget-list li.widget-list-item h4.widget-title {
+	float: right;
+}
+ul#widget-list li.widget-list-item div.widget-description {
+	margin: 0 200px 0 0;
+	padding: 0 4em 0 0;
+}
+.widget-control-save,
+.widget-control-remove {
+	margin-right: 0;
+	margin-left: 8px;
+	float: right;
+}
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+	right: auto;
+	left: 1em;
+}
diff -uNr a/mp-wp/wp-admin/css/widgets.css b/mp-wp/wp-admin/css/widgets.css
--- a/mp-wp/wp-admin/css/widgets.css false
+++ b/mp-wp/wp-admin/css/widgets.css be6966c8cca6095f5544d2b04b153bb0b5764b6dbba2764ec3d941d6884c5a183ae59535815c9fe14d39859bed3d4e55b3082ffbeb5b39bf3337244e2b595bff
@@ -0,0 +1,177 @@
+/* 2 column liquid layout */
+div.widget-liquid-left-holder {
+	float: left;
+	clear: left;
+	width: 100%;
+	margin-right: -310px;
+}
+
+div.widget-liquid-left {
+	margin-right: 320px;
+}
+
+div.widget-liquid-right {
+	float: right;
+	clear: right;
+	width: 300px;
+	position: relative;
+}
+
+/* pasitioning etc. */
+form#widgets-filter {
+	position: relative;
+}
+
+div#available-widgets-filter {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+ul#widget-list {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+ul#widget-list li.widget-list-item {
+	padding: .7em 0.9em;
+	margin: 0;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	line-height: 1;
+}
+
+h4.widget-title span {
+	float: left;
+}
+
+h4.widget-title a {
+	float: right;
+	text-decoration: underline;
+	border-bottom: none;
+	margin-left: 1em;
+}
+
+ul#widget-list li.widget-list-item h4.widget-title {
+	position: relative;
+	margin: 0;
+	padding: .5em 1em;
+	width: 200px;
+	float: left;
+	font-size: 13px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#dragHelper h4.widget-title {
+	padding: .5em 1em;
+	margin: 0;
+}
+
+ul#widget-list li.widget-list-item div.widget-description {
+	display: block;
+	margin: 0 0 0 200px;
+	padding: 0 0 0 4em;
+	font-size: 11px;
+}
+
+ul#widget-list li.widget-list-item ul.widget-control-info {
+	display: none;
+}
+
+div#sidebar-info {
+	padding: 0 1em;
+	margin-bottom: 1em;
+	font-size: 11px;
+}
+
+ul.widget-control-list {
+	list-style: none;
+	margin: 0;
+	padding: 0 1em;
+}
+
+div#current-widgets p.submit {
+	padding: 1em;
+}
+
+li.widget-list-control-item {
+	margin: 1em 0;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+li.widget-list-control-item h4,
+#dragHelper li.widget-list-control-item h4,
+li.widget-sortable h4 {
+	margin: 0;
+	cursor: move;
+	font-size: 13px;
+	padding: 0.4em 0.8em;
+	position: relative;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.widget-control-save,
+.widget-control-remove {
+	margin-right: 8px;
+	float: left;
+	text-decoration: none;
+}
+
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+	right: 1em;
+}
+
+li.widget-list-control-item h4.widget-title a:hover {
+	text-decoration: none;
+	border-bottom: none;
+}
+
+li.widget-list-control-item div.widget-control {
+	border-width: 0 1px 1px;
+	border-style: none solid solid;
+	display: none;
+	padding: 15px;
+	font-size: 11px;
+	position: relative;
+}
+
+li.widget-list-control-item div.widget-control p {
+	margin: 0 0 1em;
+	padding: 0;
+}
+
+ul.widget-control-list div.widget-control-actions {
+	padding: 0.5em 0 0;
+}
+
+.widget-control-edit {
+	font-size: 10px;
+	font-weight: normal;
+}
+
+div#current-widgets {
+	padding-top: 1em;
+	border-width: 1px 0 0;
+	border-style: solid none none;
+}
+
+#widget-controls .widefat {
+	width: 92%;
+	padding: 3px;
+}
+
+#widget-controls select.widefat {
+	width: auto;
+	display: block;
+}
diff -uNr a/mp-wp/wp-admin/custom-header.php b/mp-wp/wp-admin/custom-header.php
--- a/mp-wp/wp-admin/custom-header.php false
+++ b/mp-wp/wp-admin/custom-header.php 3e4322c7d8f1757f883a9f11abec332b8c952d7b050c801e4ba60e72853509f0603e0ea63b093dacf4ca158fe309043984900efa5ea0348c2d1cd9d0eb46388f
@@ -0,0 +1,470 @@
+<?php
+/**
+ * The custom header image script.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * The custom header image class.
+ *
+ * @since unknown
+ * @package WordPress
+ * @subpackage Administration
+ */
+class Custom_Image_Header {
+
+	/**
+	 * Callback for administration header.
+	 *
+	 * @var callback
+	 * @since unknown
+	 * @access private
+	 */
+	var $admin_header_callback;
+
+	/**
+	 * PHP4 Constructor - Register administration header callback.
+	 *
+	 * @since unknown
+	 * @param callback $admin_header_callback
+	 * @return Custom_Image_Header
+	 */
+	function Custom_Image_Header($admin_header_callback) {
+		$this->admin_header_callback = $admin_header_callback;
+	}
+
+	/**
+	 * Setup the hooks for the Custom Header admin page.
+	 *
+	 * @since unknown
+	 */
+	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_print_styles-$page", array(&$this, 'css_includes'));
+		add_action("admin_head-$page", array(&$this, 'take_action'), 50);
+		add_action("admin_head-$page", array(&$this, 'js'), 50);
+		add_action("admin_head-$page", $this->admin_header_callback, 51);
+	}
+
+	/**
+	 * Get the current step.
+	 *
+	 * @since unknown
+	 *
+	 * @return int Current step
+	 */
+	function step() {
+		if ( ! isset( $_GET['step'] ) )
+			return 1;
+
+		$step = (int) $_GET['step'];
+		if ( $step < 1 || 3 < $step )
+			$step = 1;
+
+		return $step;
+	}
+
+	/**
+	 * Setup the enqueue for the JavaScript files.
+	 *
+	 * @since unknown
+	 */
+	function js_includes() {
+		$step = $this->step();
+
+		if ( 1 == $step )
+			wp_enqueue_script('farbtastic');
+		elseif ( 2 == $step )
+			wp_enqueue_script('cropper');
+	}
+
+	/**
+	 * Setup the enqueue for the CSS files
+	 *
+	 * @since 2.7
+	 */
+	function css_includes() {
+		$step = $this->step();
+
+		if ( 1 == $step ) {
+			wp_enqueue_style('farbtastic');
+		}
+	}
+
+	/**
+	 * Execute custom header modification.
+	 *
+	 * @since unknown
+	 */
+	function take_action() {
+		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();
+		}
+	}
+
+	/**
+	 * Execute Javascript depending on step.
+	 *
+	 * @since unknown
+	 */
+	function js() {
+		$step = $this->step();
+		if ( 1 == $step )
+			$this->js_1();
+		elseif ( 2 == $step )
+			$this->js_2();
+	}
+
+	/**
+	 * Display Javascript based on Step 1.
+	 *
+	 * @since unknown
+	 */
+	function js_1() { ?>
+<script type="text/javascript">
+	var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor'];
+	var farbtastic;
+
+	function pickColor(color) {
+		jQuery('#name').css('color', color);
+		jQuery('#desc').css('color', color);
+		jQuery('#textcolor').val(color);
+		farbtastic.setColor(color);
+	}
+
+	jQuery(document).ready(function() {
+		jQuery('#pickcolor').click(function() {
+			jQuery('#colorPickerDiv').show();
+		});
+
+		jQuery('#hidetext').click(function() {
+			toggle_text();
+		});
+
+		farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); });
+		pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>');
+
+		<?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
+		toggle_text();
+		<?php } ?>
+	});
+
+	jQuery(document).mousedown(function(){
+		// Make the picker disappear, since we're using it in an independant div
+		hide_picker();
+	});
+
+	function colorDefault() {
+		pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');
+	}
+
+	function hide_picker(what) {
+		var update = false;
+		jQuery('#colorPickerDiv').each(function(){
+			var id = jQuery(this).attr('id');
+			if (id == what) {
+				return;
+			}
+			var display = jQuery(this).css('display');
+			if (display == 'block') {
+				jQuery(this).fadeOut(2);
+			}
+		});
+	}
+
+	function toggle_text(force) {
+		if(jQuery('#textcolor').val() == 'blank') {
+			//Show text
+			jQuery( buttons.toString() ).show();
+			jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');
+			jQuery('#hidetext').val('<?php _e('Hide Text'); ?>');
+		}
+		else {
+			//Hide text
+			jQuery( buttons.toString() ).hide();
+			jQuery('#textcolor').val('blank');
+			jQuery('#hidetext').val('<?php _e('Show Text'); ?>');
+		}
+	}
+
+
+
+</script>
+<?php
+	}
+
+	/**
+	 * Display Javascript based on Step 2.
+	 *
+	 * @since unknown
+	 */
+	function js_2() { ?>
+<script type="text/javascript">
+	function onEndCrop( coords, dimensions ) {
+		jQuery( '#x1' ).val(coords.x1);
+		jQuery( '#y1' ).val(coords.y1);
+		jQuery( '#x2' ).val(coords.x2);
+		jQuery( '#y2' ).val(coords.y2);
+		jQuery( '#width' ).val(dimensions.width);
+		jQuery( '#height' ).val(dimensions.height);
+	}
+
+	// with a supplied ratio
+	jQuery(document).ready(function() {
+		var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
+		var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
+		var ratio = xinit / yinit;
+		var ximg = jQuery('#upload').width();
+		var yimg = jQuery('#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
+			}
+		)
+	});
+</script>
+<?php
+	}
+
+	/**
+	 * Display first step of custom header image page.
+	 *
+	 * @since unknown
+	 */
+	function step_1() {
+		if ( $_GET['updated'] ) { ?>
+<div id="message" class="updated fade">
+<p><?php _e('Header updated.') ?></p>
+</div>
+		<?php } ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<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 admin_url('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'); ?>" 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'); ?>" /></form>
+<?php } ?>
+
+<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </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'); ?>" />
+</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;
+
+	}
+
+	/**
+	 * Display second step of custom header image page.
+	 *
+	 * @since unknown
+	 */
+	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'];
+		$type = $file['type'];
+		$file = $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);
+
+		list($width, $height, $type, $attr) = getimagesize( $file );
+
+		if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
+			// Add the meta-data
+			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+
+			set_theme_mod('header_image', clean_url($url));
+			do_action('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" style="position: relative">
+<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'); ?>" />
+</p>
+
+</form>
+</div>
+		<?php
+	}
+
+	/**
+	 * Display third step of custom header image page.
+	 *
+	 * @since unknown
+	 */
+	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'];
+		}
+
+		$original = get_attached_file( $_POST['attachment_id'] );
+
+		$cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication
+
+		$parent = get_post($_POST['attachment_id']);
+		$parent_url = $parent->guid;
+		$url = str_replace(basename($parent_url), basename($cropped), $parent_url);
+
+		// Construct the object array
+		$object = array(
+			'ID' => $_POST['attachment_id'],
+			'post_title' => basename($cropped),
+			'post_content' => $url,
+			'post_mime_type' => 'image/jpeg',
+			'guid' => $url
+		);
+
+		// Update the attachment
+		wp_insert_attachment($object, $cropped);
+		wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) );
+
+		set_theme_mod('header_image', $url);
+
+		// cleanup
+		$medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+		@unlink( apply_filters( 'wp_delete_file', $medium ) );
+		@unlink( apply_filters( 'wp_delete_file', $original ) );
+
+		return $this->finished();
+	}
+
+	/**
+	 * Display last step of custom header image page.
+	 *
+	 * @since unknown
+	 */
+	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
+	}
+
+	/**
+	 * Display the page based on the current step.
+	 *
+	 * @since unknown
+	 */
+	function admin_page() {
+		$step = $this->step();
+		if ( 1 == $step )
+			$this->step_1();
+		elseif ( 2 == $step )
+			$this->step_2();
+		elseif ( 3 == $step )
+			$this->step_3();
+	}
+
+}
+?>
diff -uNr a/mp-wp/wp-admin/edit-attachment-rows.php b/mp-wp/wp-admin/edit-attachment-rows.php
--- a/mp-wp/wp-admin/edit-attachment-rows.php false
+++ b/mp-wp/wp-admin/edit-attachment-rows.php 388b69c816ad5366dc8a395562ccaea40281812ee57cf4fd66c01e747242ae4e19207c98f8f5141dbea902847d2a812ce219eb015f35a3f13717cbbb06afefcb
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Edit attachments table for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( ! defined('ABSPATH') ) die();
+
+if ( have_posts() ) { ?>
+<table class="widefat fixed" cellspacing="0">
+	<thead>
+	<tr>
+<?php print_column_headers('upload'); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+<?php print_column_headers('upload', false); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-list" class="list:post">
+<?php
+add_filter('the_title','wp_specialchars');
+$alt = '';
+$posts_columns = get_column_headers('upload');
+$hidden = get_hidden_columns('upload');
+while (have_posts()) : the_post();
+$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
+global $current_user;
+$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+$att_title = _draft_or_post_title();
+
+?>
+	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
+
+<?php
+foreach ($posts_columns as $column_name => $column_display_name ) {
+	$class = "class=\"$column_name column-$column_name\"";
+
+	$style = '';
+	if ( in_array($column_name, $hidden) )
+		$style = ' style="display:none;"';
+
+	$attributes = "$class$style";
+
+	switch($column_name) {
+
+	case 'cb':
+		?>
+		<th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></th>
+		<?php
+		break;
+
+	case 'icon':
+		$attributes = 'class="column-icon media-icon"' . $style;
+		?>
+		<td <?php echo $attributes ?>><?php
+			if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) {
+?>
+
+				<a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>">
+					<?php echo $thumb; ?>
+				</a>
+
+<?php			}
+		?></td>
+		<?php
+		// TODO
+		break;
+
+	case 'media':
+		?>
+		<td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
+		<?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+		<p>
+		<?php
+		$actions = array();
+		if ( current_user_can('edit_post', $post->ID) )
+			$actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
+		if ( current_user_can('delete_post', $post->ID) )
+			$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+		$actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+		$action_count = count($actions);
+		$i = 0;
+		echo '<div class="row-actions">';
+		foreach ( $actions as $action => $link ) {
+			++$i;
+			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+			echo "<span class='$action'>$link$sep</span>";
+		}
+		echo '</div>';
+		?></p></td>
+		<?php
+		break;
+
+	case 'author':
+		?>
+		<td <?php echo $attributes ?>><?php the_author() ?></td>
+		<?php
+		break;
+
+	case 'tags':
+		?>
+		<td <?php echo $attributes ?>><?php
+		$tags = get_the_tags();
+		if ( !empty( $tags ) ) {
+			$out = array();
+			foreach ( $tags as $c )
+				$out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
+			echo join( ', ', $out );
+		} else {
+			_e('No Tags');
+		}
+		?></td>
+		<?php
+		break;
+
+	case 'desc':
+		?>
+		<td <?php echo $attributes ?>><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td>
+		<?php
+		break;
+
+	case 'date':
+		if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
+			$t_time = $h_time = __('Unpublished');
+		} else {
+			$t_time = get_the_time(__('Y/m/d g:i:s A'));
+			$m_time = $post->post_date;
+			$time = get_post_time( 'G', true, $post );
+			if ( ( abs($t_diff = time() - $time) ) < 86400 ) {
+				if ( $t_diff < 0 )
+					$h_time = sprintf( __('%s from now'), human_time_diff( $time ) );
+				else
+					$h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
+			} else {
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
+			}
+		}
+		?>
+		<td <?php echo $attributes ?>><?php echo $h_time ?></td>
+		<?php
+		break;
+
+	case 'parent':
+		if ( $post->post_parent > 0 ) {
+			if ( get_post($post->post_parent) ) {
+				$title =_draft_or_post_title($post->post_parent);
+			}
+			?>
+			<td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>, <?php echo get_the_time(__('Y/m/d')); ?></td>
+			<?php
+		} else {
+			?>
+			<td <?php echo $attributes ?>>&nbsp;</td>
+			<?php
+		}
+
+		break;
+
+	case 'comments':
+		$attributes = 'class="comments column-comments num"' . $style;
+		?>
+		<td <?php echo $attributes ?>><div class="post-com-count-wrapper">
+		<?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-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>');
+		if ( $left )
+			echo '</strong>';
+		?>
+		</div></td>
+		<?php
+		break;
+
+	case 'actions':
+		?>
+		<td <?php echo $attributes ?>>
+		<a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php _e('Edit'); ?></a> |
+		<a href="<?php the_permalink(); ?>"><?php _e('Get permalink'); ?></a>
+		</td>
+		<?php
+		break;
+
+	default:
+		?>
+		<td <?php echo $attributes ?>><?php do_action('manage_media_custom_column', $column_name, $id); ?></td>
+		<?php
+		break;
+	}
+}
+?>
+	</tr>
+<?php endwhile; ?>
+	</tbody>
+</table>
+<?php } else { ?>
+
+<p><?php _e('No posts found.') ?></p>
+
+<?php
+} // end if ( have_posts() )
+?>
+
diff -uNr a/mp-wp/wp-admin/edit-category-form.php b/mp-wp/wp-admin/edit-category-form.php
--- a/mp-wp/wp-admin/edit-category-form.php false
+++ b/mp-wp/wp-admin/edit-category-form.php 771c5df8d4d6ba39bfa5ff42e982a6a62b392c7fa82f745f4569942bd1e719a1032e534e15a2270d5a451011e8af630cd46d3329550c1d31e0103c2c21d28629
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Edit category form for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * @var object
+ */
+if ( ! isset( $category ) )
+	$category = (object) array();
+
+/**
+ * @ignore
+ * @since 2.7
+ * @internal Used to prevent errors in page when no category is being edited.
+ *
+ * @param object $category
+ */
+function _fill_empty_category(&$category) {
+	if ( ! isset( $category->name ) )
+		$category->name = '';
+
+	if ( ! isset( $category->slug ) )
+		$category->slug = '';
+
+	if ( ! isset( $category->parent ) )
+		$category->parent = '';
+
+	if ( ! isset( $category->description ) )
+		$category->description = '';
+}
+
+do_action('edit_category_form_pre', $category);
+
+_fill_empty_category($category);
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e('Edit Category'); ?></h2>
+<div id="ajax-response"></div>
+<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">
+<input type="hidden" name="action" value="editedcat" />
+<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?>
+	<table class="form-table">
+		<tr class="form-field form-required">
+			<th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
+			<td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" aria-required="true" /><br />
+            <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
+		</tr>
+		<tr class="form-field">
+			<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(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
+            <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
+		</tr>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
+			<td>
+	  			<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
+                <?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?>
+	  		</td>
+		</tr>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
+			<td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea><br />
+            <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
+		</tr>
+	</table>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Category'); ?>" /></p>
+<?php do_action('edit_category_form', $category); ?>
+</form>
+</div>
diff -uNr a/mp-wp/wp-admin/edit-comments.php b/mp-wp/wp-admin/edit-comments.php
--- a/mp-wp/wp-admin/edit-comments.php false
+++ b/mp-wp/wp-admin/edit-comments.php 5bcb68d3a075d461b9b1eae9921df9d6e4baec9822c47c88b39845da08b5e15f2a674851fbd2efc744f6381bff89dc9d619fff0b13773a60396f904600d9db04
@@ -0,0 +1,388 @@
+<?php
+/**
+ * Edit Comments Administration Panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('admin.php');
+
+wp_enqueue_script('admin-comments');
+enqueue_comment_hotkeys_js();
+
+$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
+
+if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
+	check_admin_referer('bulk-spam-delete', '_spam_nonce');
+
+	$delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
+	$deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
+
+	$redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam;
+	if ( $post_id )
+		$redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
+	wp_redirect( $redirect_to );
+} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) {
+	check_admin_referer('bulk-comments');
+	$doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+
+	$deleted = $approved = $unapproved = $spammed = 0;
+	foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each
+		$comment_id = (int) $comment_id;
+		$_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
+
+		if ( !current_user_can('edit_post', $_post_id) )
+			continue;
+
+		switch( $doaction ) {
+			case 'markspam' :
+				wp_set_comment_status($comment_id, 'spam');
+				$spammed++;
+				break;
+			case 'delete' :
+				wp_set_comment_status($comment_id, 'delete');
+				$deleted++;
+				break;
+			case 'approve' :
+				wp_set_comment_status($comment_id, 'approve');
+				$approved++;
+				break;
+			case 'unapprove' :
+				wp_set_comment_status($comment_id, 'hold');
+				$unapproved++;
+				break;
+		}
+	endforeach;
+
+	$redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved;
+	if ( $post_id )
+		$redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
+	if ( isset($_REQUEST['apage']) )
+		$redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
+	if ( !empty($_REQUEST['mode']) )
+		$redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
+	if ( !empty($_REQUEST['comment_status']) )
+		$redirect_to = add_query_arg('comment_status', $_REQUEST['comment_status'], $redirect_to);
+	if ( !empty($_REQUEST['s']) )
+		$redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to);
+	wp_redirect( $redirect_to );
+} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+if ( $post_id )
+	$title = sprintf(__('Edit Comments on &#8220;%s&#8221;'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
+else
+	$title = __('Edit Comments');
+
+require_once('admin-header.php');
+
+$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribute_escape($_GET['mode']);
+
+$comment_status = !empty($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : '';
+
+$comment_type = !empty($_GET['comment_type']) ? attribute_escape($_GET['comment_type']) : '';
+
+$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
+$search = attribute_escape( $search_dirty ); ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( wp_specialchars( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?>
+</h2>
+
+<?php
+if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
+	$approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
+	$deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
+	$spam = isset( $_GET['spam'] ) ? (int) $_GET['spam'] : 0;
+
+	if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
+		echo '<div id="moderated" class="updated fade"><p>';
+
+		if ( $approved > 0 ) {
+			printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
+			echo '<br />';
+		}
+
+		if ( $deleted > 0 ) {
+			printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
+			echo '<br />';
+		}
+
+		if ( $spam > 0 ) {
+			printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+			echo '<br />';
+		}
+
+		echo '</p></div>';
+	}
+}
+?>
+
+<form id="comments-form" action="" method="get">
+<ul class="subsubsub">
+<?php
+$status_links = array();
+$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
+//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
+//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
+$stati = array(
+		'all' => __ngettext_noop('All', 'All'), // singular not used
+		'moderated' => __ngettext_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
+		'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used
+		'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
+	);
+$class = ( '' === $comment_status ) ? ' class="current"' : '';
+// $status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>';
+$link = 'edit-comments.php';
+if ( !empty($comment_type) && 'all' != $comment_type )
+	$link = add_query_arg( 'comment_type', $comment_type, $link );
+foreach ( $stati as $status => $label ) {
+	$class = '';
+
+	if ( str_replace( 'all', '', $status ) == $comment_status )
+		$class = ' class="current"';
+	if ( !isset( $num_comments->$status ) )
+		$num_comments->$status = 10;
+	if ( 'all' != $status )
+		$link = add_query_arg( 'comment_status', $status, $link );
+	if ( $post_id )
+		$link = add_query_arg( 'p', absint( $post_id ), $link );
+	/*
+	// I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
+	if ( !empty( $_GET['s'] ) )
+		$link = add_query_arg( 's', attribute_escape( stripslashes( $_GET['s'] ) ), $link );
+	*/
+	$status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
+		__ngettext( $label[0], $label[1], $num_comments->$status ),
+		number_format_i18n( $num_comments->$status )
+	) . '</a>';
+}
+
+$status_links = apply_filters( 'comment_status_links', $status_links );
+
+echo implode( " |</li>\n", $status_links) . '</li>';
+unset($status_links);
+?>
+</ul>
+
+<p class="search-box">
+	<label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label>
+	<input type="text" class="search-input" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
+</p>
+
+<?php
+$comments_per_page = apply_filters('comments_per_page', 20, $comment_status);
+
+if ( isset( $_GET['apage'] ) )
+	$page = abs( (int) $_GET['apage'] );
+else
+	$page = 1;
+
+$start = $offset = ( $page - 1 ) * $comments_per_page;
+
+list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5, $post_id, $comment_type ); // Grab a few extra
+
+$_comment_post_ids = array();
+foreach ( $_comments as $_c ) {
+	$_comment_post_ids[] = $_c->comment_post_ID;
+}
+$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids);
+foreach ( (array) $_comment_post_ids as $_cpid )
+	$_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0;
+if ( empty($_comment_pending_count) )
+	$_comment_pending_count = array();
+
+$comments = array_slice($_comments, 0, $comments_per_page);
+$extra_comments = array_slice($_comments, $comments_per_page);
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'apage', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => ceil($total / $comments_per_page),
+	'current' => $page
+));
+
+?>
+
+<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+<?php if ( $post_id ) : ?>
+<input type="hidden" name="p" value="<?php echo intval( $post_id ); ?>" />
+<?php endif; ?>
+<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+<input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" />
+
+<div class="tablenav">
+
+<?php if ( $page_links ) : ?>
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( $start + 1 ),
+	number_format_i18n( min( $page * $comments_per_page, $total ) ),
+	number_format_i18n( $total ),
+	$page_links
+); echo $page_links_text; ?></div>
+<?php endif; ?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
+<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
+<option value="unapprove"><?php _e('Unapprove'); ?></option>
+<?php endif; ?>
+<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
+<option value="approve"><?php _e('Approve'); ?></option>
+<?php endif; ?>
+<?php if ( 'spam' != $comment_status ): ?>
+<option value="markspam"><?php _e('Mark as Spam'); ?></option>
+<?php endif; ?>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
+<?php wp_nonce_field('bulk-comments'); ?>
+
+<?php if ( $comment_status ) echo "<input type='hidden' name='comment_status' value='$comment_status' />\n"; ?>
+<select name="comment_type">
+	<option value="all"><?php _e('Show all comment types'); ?></option>
+<?php
+	$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
+		'comment' => __('Comments'),
+		'pings' => __('Pings'),
+	) );
+
+	foreach ( $comment_types as $type => $label ) {
+		echo "	<option value='$type'";
+		selected( $comment_type, $type );
+		echo ">$label</option>\n";
+	}
+?>
+</select>
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+
+<?php if ( isset($_GET['apage']) ) { ?>
+	<input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
+<?php }
+
+if ( 'spam' == $comment_status ) {
+	wp_nonce_field('bulk-spam-delete', '_spam_nonce'); ?>
+<input type="submit" name="delete_all_spam" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
+<?php } ?>
+<?php do_action('manage_comments_nav', $comment_status); ?>
+</div>
+
+<br class="clear" />
+
+</div>
+
+<div class="clear"></div>
+
+<?php if ( $comments ) { ?>
+<table class="widefat comments fixed" cellspacing="0">
+<thead>
+	<tr>
+<?php print_column_headers('edit-comments'); ?>
+	</tr>
+</thead>
+
+<tfoot>
+	<tr>
+<?php print_column_headers('edit-comments', false); ?>
+	</tr>
+</tfoot>
+
+<tbody id="the-comment-list" class="list:comment">
+<?php
+	foreach ($comments as $comment)
+		_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
+?>
+</tbody>
+<tbody id="the-extra-comment-list" class="list:comment" style="display: none;">
+<?php
+	foreach ($extra_comments as $comment)
+		_wp_comment_row( $comment->comment_ID, $mode, $comment_status );
+?>
+</tbody>
+</table>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links_text</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option>
+<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?>
+<option value="unapprove"><?php _e('Unapprove'); ?></option>
+<?php endif; ?>
+<?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?>
+<option value="approve"><?php _e('Approve'); ?></option>
+<?php endif; ?>
+<?php if ( 'spam' != $comment_status ): ?>
+<option value="markspam"><?php _e('Mark as Spam'); ?></option>
+<?php endif; ?>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
+
+<?php if ( 'spam' == $comment_status ) { ?>
+<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
+<?php } ?>
+<?php do_action('manage_comments_nav', $comment_status); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+</form>
+
+<form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;">
+	<input type="hidden" name="s" value="<?php echo $search; ?>" />
+	<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+	<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+	<input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" />
+	<input type="hidden" name="p" value="<?php echo attribute_escape( $post_id ); ?>" />
+	<input type="hidden" name="comment_type" value="<?php echo attribute_escape( $comment_type ); ?>" />
+	<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
+</form>
+
+<div id="ajax-response"></div>
+
+<?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?>
+<p><?php _e('No comments awaiting moderation&hellip; yet.') ?></p>
+</form>
+
+<?php } else { ?>
+<p><?php _e('No results found.') ?></p>
+</form>
+
+<?php } ?>
+</div>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+/* ]]> */
+</script>
+
+<?php
+wp_comment_reply('-1', true, 'detail');
+include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-form-advanced.php b/mp-wp/wp-admin/edit-form-advanced.php
--- a/mp-wp/wp-admin/edit-form-advanced.php false
+++ b/mp-wp/wp-admin/edit-form-advanced.php 8203c7e8b4a682a7ae9838b7ad7971654fc2f25081d91c96c0fc813394180e927454144d469963440381ef808fd793b94ea2f047263c87781ded15314b7dec12
@@ -0,0 +1,625 @@
+<?php
+/**
+ * Post advanced form for inclusion in the administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * Post ID global
+ * @name $post_ID
+ * @var int
+ */
+if ( ! isset( $post_ID ) )
+	$post_ID = 0;
+else
+	$post_ID = (int) $post_ID;
+
+$action = isset($action) ? $action : '';
+if ( isset($_GET['message']) )
+	$_GET['message'] = absint( $_GET['message'] );
+$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
+$messages[2] = __('Custom field updated.');
+$messages[3] = __('Custom field deleted.');
+$messages[4] = __('Post updated.');
+$messages[6] = sprintf(__('Post published. <a href="%s">View post</a>'), get_permalink($post_ID));
+$messages[7] = __('Post saved.');
+$messages[8] = sprintf(__('Post submitted. <a href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
+
+if ( isset($_GET['revision']) )
+	$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
+
+$notice = false;
+$notices[1] = __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
+
+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' />";
+	$autosave = false;
+} else {
+	$form_action = 'editpost';
+	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+	$autosave = wp_get_post_autosave( $post_ID );
+
+	// Detect if there exists an autosave newer than the post and if that autosave is different than the post
+	if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) {
+		foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+			if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
+				$notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+				break;
+			}
+		}
+		unset($autosave_field, $_autosave_field);
+	}
+}
+
+// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
+
+/**
+ * Display post submit form fields.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ */
+function post_submit_meta_box($post) {
+	global $action;
+
+	$can_publish = current_user_can('publish_posts');
+?>
+<div class="submitbox" id="submitpost">
+
+<div id="minor-publishing">
+
+<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+<div style="display:none;">
+<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" />
+</div>
+
+<div id="minor-publishing-actions">
+<div id="save-action">
+<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status )  { ?>
+<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" />
+<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
+<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" />
+<?php } ?>
+</div>
+
+<div id="preview-action">
+<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>
+
+<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a>
+<input type="hidden" name="wp-preview" id="wp-preview" value="" />
+</div>
+
+<div class="clear"></div>
+</div><?php // /minor-publishing-actions ?>
+
+<div id="misc-publishing-actions">
+
+<div class="misc-pub-section<?php if ( !$can_publish ) { echo '  misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label>
+<b><span id="post-status-display">
+<?php
+switch ( $post->post_status ) {
+	case 'private':
+		_e('Privately Published');
+		break;
+	case 'publish':
+		_e('Published');
+		break;
+	case 'future':
+		_e('Scheduled');
+		break;
+	case 'pending':
+		_e('Pending Review');
+		break;
+	case 'draft':
+		_e('Draft');
+		break;
+}
+?>
+</span></b>
+<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
+<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+
+<div id="post-status-select" class="hide-if-js">
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" />
+<select name='post_status' id='post_status' tabindex='4'>
+<?php if ( 'publish' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
+<?php elseif ( 'private' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
+<?php elseif ( 'future' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php endif; ?>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+</select>
+ <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
+ <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
+</div>
+
+<?php } ?>
+</div><?php // /misc-pub-section ?>
+
+<div class="misc-pub-section " id="visibility">
+<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php
+
+if ( 'private' == $post->post_status ) {
+	$post->post_password = '';
+	$visibility = 'private';
+	$visibility_trans = __('Private');
+} elseif ( !empty( $post->post_password ) ) {
+	$visibility = 'password';
+	$visibility_trans = __('Password protected');
+} elseif ( is_sticky( $post->ID ) ) {
+	$visibility = 'public';
+	$visibility_trans = __('Public, Sticky');
+} else {
+	$visibility = 'public';
+	$visibility_trans = __('Public');
+}
+
+?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a>
+
+<div id="post-visibility-select" class="hide-if-js">
+<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" />
+<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID), true); ?> />
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" />
+
+
+<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page') ?></label><br /></span>
+<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
+<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span>
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+
+<p>
+ <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
+ <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a>
+</p>
+</div>
+<?php } ?>
+
+</div><?php // /misc-pub-section ?>
+
+
+<?php
+$datef = _c( 'M j, Y @ G:i|Publish box date format');
+if ( 0 != $post->ID ) {
+	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+		$stamp = __('Scheduled for: <b>%1$s</b>');
+	} else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+		$stamp = __('Published on: <b>%1$s</b>');
+	} else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+		$stamp = __('Publish <b>immediately</b>');
+	} else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+		$stamp = __('Schedule for: <b>%1$s</b>');
+	} else { // draft, 1 or more saves, date specified
+		$stamp = __('Publish on: <b>%1$s</b>');
+	}
+	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+} else { // draft (no saves, and thus no date specified)
+	$stamp = __('Publish <b>immediately</b>');
+	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+}
+?>
+<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+<div class="misc-pub-section curtime misc-pub-section-last">
+	<span id="timestamp">
+	<?php printf($stamp, $date); ?></span>
+	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
+</div><?php // /misc-pub-section ?>
+<?php endif; ?>
+
+</div>
+<div class="clear"></div>
+</div>
+
+<div id="major-publishing-actions">
+<?php do_action('post_submitbox_start'); ?>
+<div id="delete-action">
+<?php
+if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo 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 )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<?php } ?>
+</div>
+
+<div id="publishing-action">
+<?php
+if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?>
+<?php if ( current_user_can('publish_posts') ) : ?>
+	<?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" />
+		<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" />
+	<?php else : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" />
+		<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+	<?php endif; ?>
+<?php else : ?>
+	<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" />
+	<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+<?php endif; ?>
+<?php } else { ?>
+	<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Post') ?>" />
+	<input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Post') ?>" />
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+</div>
+
+<?php
+}
+add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core');
+
+/**
+ * Display post tags form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_tags_meta_box($post) {
+?>
+<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
+<div id="tagchecklist"></div>
+<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p>
+<?php
+}
+add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
+
+/**
+ * Display post categories form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_categories_meta_box($post) {
+?>
+<ul id="category-tabs">
+	<li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+	<li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
+</ul>
+
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+		<?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+	</ul>
+</div>
+
+<div id="categories-all" class="ui-tabs-panel">
+	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+		<?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+	</ul>
+</div>
+
+<?php if ( current_user_can('manage_categories') ) : ?>
+<div id="category-adder" class="wp-hidden-children">
+	<h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
+	<p id="category-add" class="wp-hidden-child">
+		<label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
+		<label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
+		<input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
+		<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
+		<span id="category-ajax-response"></span>
+	</p>
+</div>
+<?php
+endif;
+
+}
+add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
+
+/**
+ * Display post password form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_password_meta_box($post) {
+?>
+<p>
+	<label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label>
+</p>
+<h4><?php _e( 'Post Password' ); ?></h4>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php the_post_password(); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
+<?php
+}
+// add_meta_box('passworddiv', __('Privacy Options'), 'post_password_meta_box', 'post', 'side', 'core');
+
+/**
+ * Display post excerpt form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_excerpt_meta_box($post) {
+?>
+<label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
+<p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
+<?php
+}
+add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
+
+/**
+ * Display trackback links form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_trackback_meta_box($post) {
+	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+	if ('' != $post->pinged) {
+		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
+		$already_pinged = explode("\n", trim($post->pinged));
+		foreach ($already_pinged as $pinged_url) {
+			$pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+		}
+		$pings .= '</ul>';
+	}
+
+?>
+<p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
+<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
+<?php
+if ( ! empty($pings) )
+	echo $pings;
+}
+add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');
+
+/**
+ * Display custom fields for the post form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_custom_meta_box($post) {
+?>
+<div id="postcustomstuff">
+<div id="ajax-response"></div>
+<?php
+$metadata = has_meta($post->ID);
+list_meta($metadata);
+meta_form();
+?>
+</div>
+<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
+<?php
+}
+add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core');
+
+do_action('dbx_post_advanced');
+
+/**
+ * Display comment status for post form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_comment_status_meta_box($post) {
+	global $wpdb, $post_ID;
+?>
+<input name="advanced_view" type="hidden" value="1" />
+<p class="meta-options">
+	<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 on this post') ?></label><br />
+	<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 <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label>
+</p>
+<?php
+	$total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID));
+
+	if ( !$post_ID || $post_ID < 0 || 1 > $total )
+		return;
+
+wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+?>
+
+<table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
+<thead>
+	<tr>
+    <th scope="col" class="column-author"><?php _e('Author') ?></th>
+    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
+  </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+</tbody>
+</table>
+<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p>
+<?php
+	$hidden = get_hidden_meta_boxes('post');
+	if ( ! in_array('commentstatusdiv', $hidden) ) { ?>
+		<script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script>
+<?php
+	}
+}
+add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
+
+/**
+ * Display post slug form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_slug_meta_box($post) {
+?>
+<label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<?php
+}
+if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
+	add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core');
+
+$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 ) :
+/**
+ * Display form field with list of authors.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_author_meta_box($post) {
+	global $current_user, $user_ID;
+	$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;
+?>
+<label class="hidden" for="post_author_override"><?php _e('Post Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+}
+add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core');
+endif;
+
+if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+/**
+ * Display list of post revisions.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function post_revisions_meta_box($post) {
+	wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core');
+endif;
+
+do_action('do_meta_boxes', 'post', 'normal', $post);
+do_action('do_meta_boxes', 'post', 'advanced', $post);
+do_action('do_meta_boxes', 'post', 'side', $post);
+
+require_once('admin-header.php');
+
+?>
+
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+<form name="post" action="post.php" method="post" id="post">
+<?php
+
+if ( 0 == $post_ID)
+	wp_nonce_field('add-post');
+else
+	wp_nonce_field('update-post_' .  $post_ID);
+
+?>
+
+<input type="hidden" id="user-id" 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" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
+
+<?php echo $form_extra ?>
+
+<div id="poststuff" class="metabox-holder">
+
+<div id="side-info-column" class="inner-sidebar">
+
+<?php do_action('submitpost_box'); ?>
+
+<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?>
+</div>
+
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+<div id="titlediv">
+<div id="titlewrap">
+	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
+</div>
+<div class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+<?php if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?>
+	<div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+	echo $sample_permalink_html;
+endif; ?>
+	</div>
+<?php } ?>
+</div>
+</div>
+
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+
+<?php the_editor($post->post_content); ?>
+
+<div id="post-status-info">
+	<span id="wp-word-count" class="alignleft"></span>
+	<span class="alignright">
+	<span id="autosave">&nbsp;</span>
+<?php
+	if ( $post_ID ) {
+		echo '<span id="last-edit">';
+		if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+			$last_user = get_userdata($last_id);
+			printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+		} else {
+			printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+		}
+		echo '</span>';
+	}
+?>
+	</span>
+	<br class="clear" />
+</div>
+
+
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+</div>
+
+<?php
+
+do_meta_boxes('post', 'normal', $post);
+
+do_action('edit_form_advanced');
+
+do_meta_boxes('post', 'advanced', $post);
+
+do_action('dbx_post_sidebar');
+
+?>
+
+</div>
+</div>
+<br class="clear" />
+</div><!-- /poststuff -->
+</form>
+</div>
+
+<?php wp_comment_reply(); ?>
+
+<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
+<script type="text/javascript">
+try{document.post.title.focus();}catch(e){}
+</script>
+<?php endif; ?>
diff -uNr a/mp-wp/wp-admin/edit-form-comment.php b/mp-wp/wp-admin/edit-form-comment.php
--- a/mp-wp/wp-admin/edit-form-comment.php false
+++ b/mp-wp/wp-admin/edit-form-comment.php 385a932df06790b1c0f63315966076f74d2d2fed040814106b254c5e0d165101992d0c5e9b0becad5be6e6adf9a5c7615ebb74082e9591b2bbfa9853a8438406
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Edit comment form for inclusion in another file.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * @var string
+ */
+$submitbutton_text = __('Edit Comment');
+$toprow_title = sprintf(__('Editing Comment # %s'), $comment->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 name="post" action="comment.php" method="post" id="post">
+<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e('Edit Comment'); ?></h2>
+
+<div id="poststuff" class="metabox-holder">
+<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
+<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
+<?php
+
+$email = attribute_escape( $comment->comment_author_email );
+$url = attribute_escape( $comment->comment_author_url );
+// add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core');
+?>
+
+<div id="side-info-column" class="inner-sidebar">
+<div id="submitdiv" class="stuffbox" >
+<h3><span class='hndle'><?php _e('Status') ?></span></h3>
+<div class="inside">
+<div class="submitbox" id="submitcomment">
+<div id="minor-publishing">
+
+<div id="minor-publishing-actions">
+<div id="preview-action">
+<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a>
+</div>
+<div class="clear"></div>
+</div>
+
+<div id="misc-publishing-actions">
+
+<div class="misc-pub-section" id="comment-status-radio">
+<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|adjective') ?></label><br />
+<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Pending|adjective') ?></label><br />
+<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|adjective'); ?></label>
+</div>
+
+<div class="misc-pub-section curtime misc-pub-section-last">
+<?php
+$datef = _c( 'M j, Y @ G:i|Publish box date format');
+$stamp = __('Submitted on: <b>%1$s</b>');
+$date = date_i18n( $datef, strtotime( $comment->comment_date ) );
+?>
+<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
+</div>
+</div> <!-- misc actions -->
+<div class="clear"></div>
+</div>
+
+<div id="major-publishing-actions">
+<div id="delete-action">
+<a class='submitdelete deletion' href='<?php echo wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?></a>
+</div>
+<div id="publishing-action">
+<input type="submit" name="save" value="<?php _e('Update Comment'); ?>" tabindex="4" class="button-primary" />
+</div>
+<div class="clear"></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+
+<div id="post-body" class="has-sidebar">
+<div id="post-body-content" class="has-sidebar-content">
+
+<div id="namediv" class="stuffbox">
+<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
+<div class="inside">
+<table class="form-table">
+<tbody>
+<tr valign="top">
+	<td class="first"><?php _e( 'Name:' ); ?></td>
+	<td><input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
+</tr>
+<tr valign="top">
+	<td class="first">
+	<?php
+		if ( $email ) {
+			printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
+		} else {
+			_e( 'E-mail:' );
+		}
+?></td>
+	<td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $email; ?>" tabindex="2" id="email" /></td>
+</tr>
+<tr valign="top">
+	<td class="first">
+	<?php
+		$url = get_comment_author_url();
+		if ( ! empty( $url ) && 'http://' != $url ) {
+			$link = "<a href='$url' rel='external nofollow' target='_blank'>" . __('visit site') . "</a>";
+			printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
+		} else {
+			_e( 'URL:' );
+		} ?></td>
+	<td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo $url; ?>" tabindex="3" /></td>
+</tr>
+</tbody>
+</table>
+<br />
+</div>
+</div>
+
+<div id="postdiv" class="postarea">
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+</div>
+
+<?php do_meta_boxes('comment', 'normal', $comment); ?>
+
+<input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
+<input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php wp_original_referer_field(true, 'previous'); ?>
+<input type="hidden" name="noredir" value="1" />
+
+</div>
+</div>
+</div>
+</div>
+</form>
+
+<script type="text/javascript">
+try{document.post.name.focus();}catch(e){}
+</script>
diff -uNr a/mp-wp/wp-admin/edit-link-categories.php b/mp-wp/wp-admin/edit-link-categories.php
--- a/mp-wp/wp-admin/edit-link-categories.php false
+++ b/mp-wp/wp-admin/edit-link-categories.php eeb0f56f6aeb162762816414e04ebddad0a32dd8eba218e894eb229e69312ea1e2318782a44dcbd359676d58f2b3a189d6e23bddf52779a97505395faa91f6dd
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Edit Link Categories Administration Panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('admin.php');
+
+// Handle bulk actions
+if ( isset($_GET['action']) && isset($_GET['delete']) ) {
+	check_admin_referer('bulk-link-categories');
+	$doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	if ( 'delete' == $doaction ) {
+		foreach( (array) $_GET['delete'] as $cat_ID ) {
+			$cat_name = get_term_field('name', $cat_ID, 'link_category');
+			$default_cat_id = get_option('default_link_category');
+
+			// Don't delete the default cats.
+			if ( $cat_ID == $default_cat_id )
+				wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+
+			wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
+		}
+
+		$location = 'edit-link-categories.php';
+		if ( $referer = wp_get_referer() ) {
+			if ( false !== strpos($referer, 'edit-link-categories.php') )
+				$location = $referer;
+		}
+
+		$location = add_query_arg('message', 6, $location);
+		wp_redirect($location);
+		exit();
+	}
+} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+$title = __('Link Categories');
+
+wp_enqueue_script('admin-categories');
+if ( current_user_can('manage_categories') )
+	wp_enqueue_script('inline-edit-tax');
+
+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.');
+$messages[6] = __('Categories deleted.'); ?>
+
+<div class="wrap nosubsub">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
+
+<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<form class="search-form" action="" method="get">
+<p class="search-box">
+	<label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?>:</label>
+	<input type="text" class="search-input" id="link-category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+</p>
+</form>
+<br class="clear" />
+
+<div id="col-container">
+
+<div id="col-right">
+<div class="col-wrap">
+<form id="posts-filter" action="" method="get">
+<div class="tablenav">
+
+<?php
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( ! isset( $catsperpage ) || $catsperpage < 0 )
+	$catsperpage = 20;
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => ceil(wp_count_terms('link_category') / $catsperpage),
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-link-categories'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<div class="clear"></div>
+
+<table class="widefat fixed" cellspacing="0">
+	<thead>
+	<tr>
+<?php print_column_headers('edit-link-categories'); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+<?php print_column_headers('edit-link-categories', false); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-list" class="list:link-cat">
+<?php
+$start = ($pagenum - 1) * $catsperpage;
+$args = array('offset' => $start, 'number' => $catsperpage, 'hide_empty' => 0);
+if ( !empty( $_GET['s'] ) )
+	$args['search'] = $_GET['s'];
+
+$categories = get_terms( 'link_category', $args );
+if ( $categories ) {
+	$output = '';
+	foreach ( $categories as $category ) {
+		$output .= link_cat_row($category);
+	}
+	echo $output;
+	unset($category);
+}
+
+?>
+	</tbody>
+</table>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+</div>
+
+<br class="clear" />
+</div>
+<br class="clear" />
+</form>
+
+<div class="form-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>
+
+
+</div>
+</div><!-- /col-right -->
+
+<div id="col-left">
+<div class="col-wrap">
+
+<?php if ( current_user_can('manage_categories') ) {
+	$category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?>
+
+<div class="form-wrap">
+<h3><?php _e('Add Category'); ?></h3>
+<div id="ajax-response"></div>
+<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">
+<input type="hidden" name="action" value="addcat" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-link-category'); ?>
+
+<div class="form-field form-required">
+	<label for="name"><?php _e('Category name') ?></label>
+	<input name="name" id="name" type="text" value="" size="40" aria-required="true" />
+</div>
+
+<div class="form-field">
+	<label for="slug"><?php _e('Category slug') ?></label>
+	<input name="slug" id="slug" type="text" value="" size="40" />
+	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
+</div>
+
+<div class="form-field">
+	<label for="description"><?php _e('Description (optional)') ?></label>
+	<textarea name="description" id="description" rows="5" cols="40"></textarea>
+</div>
+
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p>
+<?php do_action('edit_link_category_form', $category); ?>
+</form>
+</div>
+
+<?php } ?>
+
+</div>
+</div><!-- /col-left -->
+
+</div><!-- /col-container -->
+</div><!-- /wrap -->
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+/* ]]> */
+</script>
+
+<?php inline_edit_term_row('edit-link-categories'); ?>
+<?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-link-category-form.php b/mp-wp/wp-admin/edit-link-category-form.php
--- a/mp-wp/wp-admin/edit-link-category-form.php false
+++ b/mp-wp/wp-admin/edit-link-category-form.php 1bd18b31925ff819da41679ff77f2842ce3fb97f4b05050ea494ce59372b9aa6ccbcde9bad3f4a4f299965afd45cd6b2aabb1229b6ac6ead9e291fd8ddcf08af
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Edit link category form for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * @var object
+ */
+if ( ! isset( $category ) )
+	$category = (object) array();
+
+if ( ! empty($cat_ID) ) {
+	/**
+	 * @var string
+	 */
+	$heading = '<h2>' . __('Edit Link Category') . '</h2>';
+	$submit_text = __('Update Category');
+	$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
+	$action = 'editedcat';
+	$nonce_action = 'update-link-category_' . $cat_ID;
+	do_action('edit_link_category_form_pre', $category);
+} else {
+	$heading = '<h2>' . __('Add Link Category') . '</h2>';
+	$submit_text = __('Add Category');
+	$form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">';
+	$action = 'addcat';
+	$nonce_action = 'add-link-category';
+	do_action('add_link_category_form_pre', $category);
+}
+
+/**
+ * @ignore
+ * @since 2.7
+ * @internal Used to prevent errors in page when no category is being edited.
+ *
+ * @param object $category
+ */
+function _fill_empty_link_category(&$category) {
+	if ( ! isset( $category->name ) )
+		$category->name = '';
+
+	if ( ! isset( $category->slug ) )
+		$category->slug = '';
+
+	if ( ! isset( $category->description ) )
+		$category->description = '';
+}
+
+_fill_empty_link_category($category);
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<?php echo $heading ?>
+<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_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
+	<table class="form-table">
+		<tr class="form-field form-required">
+			<th scope="row" valign="top"><label for="name"><?php _e('Category name') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" aria-required="true" /></td>
+		</tr>
+		<tr class="form-field">
+			<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 attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
+            <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
+		</tr>
+		<tr class="form-field">
+			<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" class="button-primary" name="submit" value="<?php echo $submit_text ?>" /></p>
+<?php do_action('edit_link_category_form', $category); ?>
+</form>
+</div>
diff -uNr a/mp-wp/wp-admin/edit-link-form.php b/mp-wp/wp-admin/edit-link-form.php
--- a/mp-wp/wp-admin/edit-link-form.php false
+++ b/mp-wp/wp-admin/edit-link-form.php c6ca0857a2b4ef3e34586ab128bd6afd3e0ed1176406e6823249f498365d5ba8efe10f48f1495635ae6d14a2d5b4fef6957a5d7038d21813b1ee1209ac8a1c38
@@ -0,0 +1,420 @@
+<?php
+/**
+ * Edit links form for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( ! empty($link_id) ) {
+	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
+	$submit_text = __('Update Link');
+	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';
+	$nonce_action = 'update-bookmark_' . $link_id;
+} else {
+	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
+	$submit_text = __('Add Link');
+	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';
+	$nonce_action = 'add-bookmark';
+}
+
+/**
+ * Display checked checkboxes attribute for xfn microformat options.
+ *
+ * @since 1.0.1
+ *
+ * @param string $class
+ * @param string $value
+ * @param mixed $deprecated Not used.
+ */
+function xfn_check($class, $value = '', $deprecated = '') {
+	global $link;
+
+	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $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"';
+	}
+}
+
+/**
+ * Display link create form fields.
+ *
+ * @since 2.7.0
+ *
+ * @param object $link
+ */
+function link_submit_meta_box($link) {
+?>
+<div class="submitbox" id="submitlink">
+
+<div id="minor-publishing">
+
+<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+<div style="display:none;">
+<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" />
+</div>
+
+<div id="minor-publishing-actions">
+<div id="preview-action">
+<?php if ( !empty($link->link_id) ) { ?>
+	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank" tabindex="4"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+
+<div id="misc-publishing-actions">
+<div class="misc-pub-section misc-pub-section-last">
+	<label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label>
+</div>
+</div>
+
+</div>
+
+<div id="major-publishing-actions">
+<?php do_action('post_submitbox_start'); ?>
+<div id="delete-action">
+<?php
+if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
+	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<?php } ?>
+</div>
+
+<div id="publishing-action">
+<?php if ( !empty($link->link_id) ) { ?>
+	<input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Update Link') ?>" />
+<?php } else { ?>
+	<input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Add Link') ?>" />
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+<?php do_action('submitlink_box'); ?>
+<div class="clear"></div>
+</div>
+<?php
+}
+add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
+
+/**
+ * Display link categories form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $link
+ */
+function link_categories_meta_box($link) { ?>
+<div id="category-adder" class="wp-hidden-children">
+	<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+	<p id="link-category-add" class="wp-hidden-child">
+		<label class="hidden" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+		<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" aria-required="true" />
+		<input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
+		<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+		<span id="category-ajax-response"></span>
+	</p>
+</div>
+
+<ul id="category-tabs">
+	<li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
+	<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+</ul>
+
+<div id="categories-all" class="ui-tabs-panel">
+	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+		<?php
+		if ( isset($link->link_id) )
+			wp_link_category_checklist($link->link_id);
+		else
+			wp_link_category_checklist();
+		?>
+	</ul>
+</div>
+
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+	<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
+		<?php wp_popular_terms_checklist('link_category'); ?>
+	</ul>
+</div>
+<?php
+}
+add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
+
+/**
+ * Display form fields for changing link target.
+ *
+ * @since 2.6.0
+ *
+ * @param object $link
+ */
+function link_target_meta_box($link) { ?>
+<fieldset><legend class="hidden"><?php _e('Target') ?></legend>
+<label for="link_target_blank" class="selectit">
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<code>_blank</code></label><br />
+<label for="link_target_top" class="selectit">
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<code>_top</code></label><br />
+<label for="link_target_none" class="selectit">
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<?php _e('none') ?></label>
+</fieldset>
+<p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
+<?php
+}
+add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core');
+
+/**
+ * Display xfn form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $link
+ */
+function link_xfn_meta_box($link) {
+?>
+<table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
+	<tr>
+		<th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
+		<td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? $link->link_rel : ''); ?>" /></td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<table cellpadding="3" cellspacing="5" class="form-table">
+				<tr>
+					<th scope="row"> <?php _e('identity') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('identity') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('friendship') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('friendship') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('physical') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('physical') ?> </legend>
+						<label for="met">
+						<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
+						<?php _e('met') ?></label>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('professional') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('professional') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('geographical') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('geographical') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('family') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('family') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+				<tr>
+					<th scope="row"> <?php _e('romantic') ?> </th>
+					<td><fieldset><legend class="hidden"> <?php _e('romantic') ?> </legend>
+						<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>
+					</fieldset></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
+<?php
+}
+add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core');
+
+/**
+ * Display advanced link options form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $link
+ */
+function link_advanced_meta_box($link) {
+?>
+<table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
+		<td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? $link->link_image : ''); ?>" style="width: 95%" /></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
+		<td><input name="link_rss" type="text" id="rss_uri" value="<?php echo  ( isset( $link->link_rss ) ? $link->link_rss : ''); ?>" size="50" style="width: 95%" /></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
+		<td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo  ( isset( $link->link_notes ) ? $link->link_notes : ''); ?></textarea></td>
+	</tr>
+	<tr class="form-field">
+		<th valign="top"  scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
+		<td><select name="link_rating" id="link_rating" size="1">
+		<?php
+			for ($r = 0; $r < 10; $r++) {
+				echo('            <option value="'.$r.'" ');
+				if ( isset($link->link_rating) && $link->link_rating == $r)
+					echo 'selected="selected"';
+				echo('>'.$r.'</option>');
+			}
+		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+		</td>
+	</tr>
+</table>
+<?php
+}
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
+
+do_action('do_meta_boxes', 'link', 'normal', $link);
+do_action('do_meta_boxes', 'link', 'advanced', $link);
+do_action('do_meta_boxes', 'link', 'side', $link);
+
+require_once ('admin-header.php');
+
+?>
+
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
+<?php if ( isset( $_GET['added'] ) ) : ?>
+<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
+<?php endif; ?>
+
+<?php
+if ( !empty($form) )
+	echo $form;
+if ( !empty($link_added) )
+	echo $link_added;
+
+wp_nonce_field( $nonce_action );
+wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+
+<div id="poststuff" class="metabox-holder">
+
+<div id="side-info-column" class="inner-sidebar">
+<?php
+
+do_action('submitlink_box');
+$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
+
+?>
+</div>
+
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+<div id="namediv" class="stuffbox">
+<h3><label for="link_name"><?php _e('Name') ?></label></h3>
+<div class="inside">
+	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" />
+    <p><?php _e('Example: Nifty blogging software'); ?></p>
+</div>
+</div>
+
+<div id="addressdiv" class="stuffbox">
+<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
+<div class="inside">
+	<input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" />
+    <p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p>
+</div>
+</div>
+
+<div id="descriptiondiv" class="stuffbox">
+<h3><label for="link_description"><?php _e('Description') ?></label></h3>
+<div class="inside">
+	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo isset($link->link_description) ? $link->link_description : ''; ?>" id="link_description" />
+    <p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
+</div>
+</div>
+
+<?php
+
+do_meta_boxes('link', 'normal', $link);
+
+do_meta_boxes('link', 'advanced', $link);
+
+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>
+</div>
+</div>
+
+</form>
+</div>
diff -uNr a/mp-wp/wp-admin/edit-page-form.php b/mp-wp/wp-admin/edit-page-form.php
--- a/mp-wp/wp-admin/edit-page-form.php false
+++ b/mp-wp/wp-admin/edit-page-form.php 86fd23e1bdaee66780c0e6abad986574fabc356be898629f73db5e705d06cb41e5828befa072c69156c9cb7b6a7f2c12a40e99abda3f52e35092d8415c006ee5
@@ -0,0 +1,496 @@
+<?php
+/**
+ * Edit page form for inclusion in the administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * Post ID global.
+ * @name $post_ID
+ * @var int
+ */
+if ( ! isset( $post_ID ) )
+	$post_ID = 0;
+if ( ! isset( $temp_ID ) )
+	$temp_ID = 0;
+
+if ( isset($_GET['message']) )
+	$_GET['message'] = absint( $_GET['message'] );
+$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
+$messages[2] = __('Custom field updated.');
+$messages[3] = __('Custom field deleted.');
+$messages[4] = __('Page updated.');
+$messages[5] = sprintf(__('Page published. <a href="%s">View page</a>'), get_permalink($post_ID));
+$messages[6] = sprintf(__('Page submitted. <a href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
+
+if ( isset($_GET['revision']) )
+	$messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
+
+$notice = false;
+$notices[1] = __( 'There is an autosave of this page that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
+
+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' />";
+} 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' />";
+	$autosave = wp_get_post_autosave( $post_ID );
+	if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
+		$notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+}
+
+$temp_ID = (int) $temp_ID;
+$user_ID = (int) $user_ID;
+
+/**
+ * Display submit form fields.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ */
+function page_submit_meta_box($post) {
+	global $action;
+
+	$can_publish = current_user_can('publish_pages');
+?>
+<div class="submitbox" id="submitpage">
+
+<div id="minor-publishing">
+
+<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+<div style="display:none;">
+<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" />
+</div>
+
+<div id="minor-publishing-actions">
+<div id="save-action">
+<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status )  { ?>
+<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" />
+<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
+<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" />
+<?php } ?>
+</div>
+
+<div id="preview-action">
+<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>
+
+<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a>
+<input type="hidden" name="wp-preview" id="wp-preview" value="" />
+</div>
+
+<div class="clear"></div>
+</div><?php // /minor-publishing-actions ?>
+
+<div id="misc-publishing-actions">
+
+<div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label>
+<b><span id="post-status-display">
+<?php
+switch ( $post->post_status ) {
+	case 'private':
+		_e('Privately Published');
+		break;
+	case 'publish':
+		_e('Published');
+		break;
+	case 'future':
+		_e('Scheduled');
+		break;
+	case 'pending':
+		_e('Pending Review');
+		break;
+	case 'draft':
+		_e('Draft');
+		break;
+}
+?>
+</span></b>
+<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
+<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+
+<div id="post-status-select" class="hide-if-js">
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" />
+<select name='post_status' id='post_status' tabindex='4'>
+<?php if ( 'publish' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
+<?php elseif ( 'private' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
+<?php elseif ( 'future' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php endif; ?>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+</select>
+
+ <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
+ <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
+</div>
+
+<?php } ?>
+</div><?php // /misc-pub-section ?>
+
+<div class="misc-pub-section " id="visibility">
+<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php
+
+if ( 'private' == $post->post_status ) {
+	$post->post_password = '';
+	$visibility = 'private';
+	$visibility_trans = __('Private');
+} elseif ( !empty( $post->post_password ) ) {
+	$visibility = 'password';
+	$visibility_trans = __('Password protected');
+} else {
+	$visibility = 'public';
+	$visibility_trans = __('Public');
+}
+
+?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a>
+
+<div id="post-visibility-select" class="hide-if-js">
+<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" />
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" />
+
+
+<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
+<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span>
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+
+<p>
+ <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
+ <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a>
+</p>
+</div>
+<?php } ?>
+
+</div><?php // /misc-pub-section ?>
+
+<?php
+$datef = _c( 'M j, Y @ G:i|Publish box date format');
+if ( 0 != $post->ID ) {
+	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+		$stamp = __('Scheduled for: <b>%1$s</b>');
+	} else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+		$stamp = __('Published on: <b>%1$s</b>');
+	} else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+		$stamp = __('Publish <b>immediately</b>');
+	} else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+		$stamp = __('Schedule for: <b>%1$s</b>');
+	} else { // draft, 1 or more saves, date specified
+		$stamp = __('Publish on: <b>%1$s</b>');
+	}
+	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+} else { // draft (no saves, and thus no date specified)
+	$stamp = __('Publish <b>immediately</b>');
+	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+}
+?>
+<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+<div class="misc-pub-section curtime misc-pub-section-last">
+	<span id="timestamp">
+	<?php printf($stamp, $date); ?></span>
+	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
+</div><?php // /misc-pub-section ?>
+<?php endif; ?>
+
+</div>
+<div class="clear"></div>
+</div>
+
+<div id="major-publishing-actions">
+<?php do_action('post_submitbox_start'); ?>
+<div id="delete-action">
+<?php
+if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo 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 page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<?php } ?>
+</div>
+
+<div id="publishing-action">
+<?php
+if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?>
+<?php if ( $can_publish ) : ?>
+	<?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" />
+		<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" />
+	<?php else : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" />
+		<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+	<?php endif; ?>
+<?php else : ?>
+	<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" />
+	<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+<?php endif; ?>
+<?php } else { ?>
+	<input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Page') ?>" />
+	<input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Page') ?>" />
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+</div>
+<?php
+}
+add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core');
+
+/**
+ * Display page password form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function page_password_meta_box($post){
+?>
+<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
+<h4><?php _e( 'Page Password' ); ?></h4>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php the_post_password(); ?>" /></p>
+<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
+<?php
+}
+// add_meta_box('pagepassworddiv', __('Privacy Options'), 'page_password_meta_box', 'page', 'side', 'core');
+
+/**
+ * Display page attributes form fields.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ */
+function page_attributes_meta_box($post){
+?>
+<h5><?php _e('Parent') ?></h5>
+<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label>
+<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'), 'sort_column'=> 'menu_order, post_title')); ?>
+<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
+<?php
+	if ( 0 != count( get_page_templates() ) ) {
+?>
+<h5><?php _e('Template') ?></h5>
+<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
+<option value='default'><?php _e('Default Template'); ?></option>
+<?php page_template_dropdown($post->page_template); ?>
+</select>
+<p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p>
+<?php
+	}
+?>
+<h5><?php _e('Order') ?></h5>
+<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
+<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
+<?php
+}
+add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', 'page', 'side', 'core');
+
+/**
+ * Display custom field for page form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function page_custom_meta_box($post){
+?>
+<div id="postcustomstuff">
+<?php
+$metadata = has_meta($post->ID);
+list_meta($metadata);
+meta_form();
+?>
+<div id="ajax-response"></div>
+</div>
+<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
+<?php
+}
+add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'normal', 'core');
+
+/**
+ * Display comments status form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function page_comments_status_meta_box($post){
+?>
+<input name="advanced_view" type="hidden" value="1" />
+<p><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></p>
+<p><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></p>
+<p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
+<?php
+}
+add_meta_box('pagecommentstatusdiv', __('Discussion'), 'page_comments_status_meta_box', 'page', 'normal', 'core');
+
+/**
+ * Display page slug form fields.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function page_slug_meta_box($post){
+?>
+<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<?php
+}
+add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core');
+
+$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
+if ( $post->post_author && !in_array($post->post_author, $authors) )
+	$authors[] = $post->post_author;
+if ( $authors && count( $authors ) > 1 ) {
+	/**
+	 * Display page author form fields, when more than one author exists.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @param object $post
+	 */
+	function page_author_meta_box($post){
+		global $current_user, $user_ID;
+		$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
+		if ( $post->post_author && !in_array($post->post_author, $authors) )
+			$authors[] = $post->post_author;
+?>
+<label class="hidden" for="post_author_override"><?php _e('Page Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+	}
+	add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'normal', 'core');
+}
+
+if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+/**
+ * Display list of page revisions.
+ *
+ * @since 2.6.0
+ *
+ * @param object $post
+ */
+function page_revisions_meta_box($post) {
+	wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
+endif;
+
+do_action('do_meta_boxes', 'page', 'normal', $post);
+do_action('do_meta_boxes', 'page', 'advanced', $post);
+do_action('do_meta_boxes', 'page', 'side', $post);
+
+require_once('admin-header.php');
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
+<form name="post" action="page.php" method="post" id="post">
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+
+<?php
+wp_nonce_field($nonce_action);
+
+if (isset($mode) && 'bookmarklet' == $mode)
+	echo '<input type="hidden" name="mode" value="bookmarklet" />';
+?>
+<input type="hidden" id="user-id" 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" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
+<?php echo $form_extra ?>
+<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
+
+<div id="poststuff" class="metabox-holder">
+
+<div id="side-info-column" class="inner-sidebar">
+
+<?php
+
+do_action('submitpage_box');
+$side_meta_boxes = do_meta_boxes('page', 'side', $post);
+
+?>
+</div>
+
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+
+<div id="titlediv">
+<div id="titlewrap">
+  <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
+</div>
+<div class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+	<div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+	echo $sample_permalink_html;
+endif; ?>
+	</div>
+</div>
+</div>
+
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+
+<?php the_editor($post->post_content); ?>
+<div id="post-status-info">
+	<span id="wp-word-count" class="alignleft"></span>
+	<span class="alignright">
+	<span id="autosave">&nbsp;</span>
+
+<?php
+	if ($post_ID) {
+		if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+			$last_user = get_userdata($last_id);
+			printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+		} else {
+			printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+		}
+	}
+?>
+	</span>
+	<br class="clear" />
+</div>
+
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+</div>
+
+<?php
+
+do_meta_boxes('page', 'normal', $post);
+do_action('edit_page_form');
+do_meta_boxes('page', 'advanced', $post);
+
+?>
+
+</div>
+</div>
+</div>
+
+</form>
+</div>
+
+<script type="text/javascript">
+try{document.post.title.focus();}catch(e){}
+</script>
diff -uNr a/mp-wp/wp-admin/edit-pages.php b/mp-wp/wp-admin/edit-pages.php
--- a/mp-wp/wp-admin/edit-pages.php false
+++ b/mp-wp/wp-admin/edit-pages.php 3043631715d6345b415aa169554043aeeff92a92b95d9445aaa69c6af0636c1ff00cd3535b1bb04086f9d92d682b3fca847e89b466b5fb9f24cd2e6dbe606e5f
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Edit Pages Administration Panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('admin.php');
+
+// Handle bulk actions
+if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
+	$doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+
+	switch ( $doaction ) {
+		case 'delete':
+			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+				check_admin_referer('bulk-pages');
+				$deleted = 0;
+				foreach( (array) $_GET['post'] as $post_id_del ) {
+					$post_del = & get_post($post_id_del);
+
+					if ( !current_user_can('delete_page', $post_id_del) )
+						wp_die( __('You are not allowed to delete this page.') );
+
+					if ( $post_del->post_type == 'attachment' ) {
+						if ( ! wp_delete_attachment($post_id_del) )
+							wp_die( __('Error in deleting...') );
+					} else {
+						if ( !wp_delete_post($post_id_del) )
+							wp_die( __('Error in deleting...') );
+					}
+					$deleted++;
+				}
+			}
+			break;
+		case 'edit':
+			if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) {
+				check_admin_referer('bulk-pages');
+
+				if ( -1 == $_GET['_status'] ) {
+					$_GET['post_status'] = null;
+					unset($_GET['_status'], $_GET['post_status']);
+				} else {
+					$_GET['post_status'] = $_GET['_status'];
+				}
+
+				$done = bulk_edit_posts($_GET);
+			}
+			break;
+	}
+
+	$sendback = wp_get_referer();
+	if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
+	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
+	if ( isset($done) ) {
+		$done['updated'] = count( $done['updated'] );
+		$done['skipped'] = count( $done['skipped'] );
+		$done['locked'] = count( $done['locked'] );
+		$sendback = add_query_arg( $done, $sendback );
+	}
+	if ( isset($deleted) )
+		$sendback = add_query_arg('deleted', $deleted, $sendback);
+	wp_redirect($sendback);
+	exit();
+} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+if ( empty($title) )
+	$title = __('Edit Pages');
+$parent_file = 'edit-pages.php';
+wp_enqueue_script('inline-edit-post');
+
+$post_stati  = array(	//	array( adj, noun )
+		'publish' => array(__('Published|page'), __('Published pages'), _n_noop('Published <span class="count">(%s)</span>|page', 'Published <span class="count">(%s)</span>')),
+		'future' => array(__('Scheduled|page'), __('Scheduled pages'), _n_noop('Scheduled <span class="count">(%s)</span>|page', 'Scheduled <span class="count">(%s)</span>')),
+		'pending' => array(__('Pending Review|page'), __('Pending pages'), _n_noop('Pending Review <span class="count">(%s)</span>|page', 'Pending Review <span class="count">(%s)</span>')),
+		'draft' => array(__('Draft|page'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>|page', 'Drafts <span class="count">(%s)</span>')),
+		'private' => array(__('Private|page'), __('Private pages'), _n_noop('Private <span class="count">(%s)</span>|page', 'Private <span class="count">(%s)</span>'))
+	);
+
+$query = array('post_type' => 'page', 'orderby' => 'menu_order title', 'what_to_show' => 'posts',
+	'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc');
+
+$post_status_label = __('Pages');
+if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
+	$post_status_label = $post_stati[$_GET['post_status']][1];
+	$query['post_status'] = $_GET['post_status'];
+	$query['perm'] = 'readable';
+}
+
+$query = apply_filters('manage_pages_query', $query);
+wp($query);
+
+if ( is_singular() ) {
+	wp_enqueue_script( 'admin-comments' );
+	enqueue_comment_hotkeys_js();
+}
+
+require_once('admin-header.php'); ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+</h2>
+
+<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
+<div id="message" class="updated fade"><p>
+<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
+	printf( __ngettext( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
+	unset($_GET['updated']);
+}
+
+if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) {
+	printf( __ngettext( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) );
+	unset($_GET['skipped']);
+}
+
+if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
+	printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
+	unset($_GET['locked']);
+}
+
+if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
+	printf( __ngettext( 'Page deleted.', '%s pages deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
+	unset($_GET['deleted']);
+}
+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
+?>
+</p></div>
+<?php } ?>
+
+<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
+<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit page'); ?></a></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<form id="posts-filter" action="" method="get">
+<ul class="subsubsub">
+<?php
+
+$avail_post_stati = get_available_post_statuses('page');
+if ( empty($locked_post_status) ) :
+$status_links = array();
+$num_posts = wp_count_posts('page', 'readable');
+$total_posts = array_sum( (array) $num_posts );
+$class = empty($_GET['post_status']) ? ' class="current"' : '';
+$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>';
+foreach ( $post_stati as $status => $label ) {
+	$class = '';
+
+	if ( !in_array($status, $avail_post_stati) )
+		continue;
+
+	if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] )
+		$class = ' class="current"';
+
+	$status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nc( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
+}
+echo implode( " |</li>\n", $status_links ) . '</li>';
+unset($status_links);
+endif;
+?>
+</ul>
+
+<p class="search-box">
+	<label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?>:</label>
+	<input type="text" class="search-input" id="page-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
+</p>
+
+<?php if ( isset($_GET['post_status'] ) ) : ?>
+<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<?php endif; ?>
+
+<?php if ($posts) { ?>
+
+<div class="tablenav">
+
+<?php
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
+if ( empty($pagenum) )
+	$pagenum = 1;
+if( ! isset( $per_page ) || $per_page < 0 )
+	$per_page = 20;
+
+$num_pages = ceil($wp_query->post_count / $per_page);
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => $num_pages,
+	'current' => $pagenum
+));
+
+if ( $page_links ) : ?>
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
+	number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
+	number_format_i18n( $wp_query->post_count ),
+	$page_links
+); echo $page_links_text; ?></div>
+<?php endif; ?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-pages'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<div class="clear"></div>
+
+<table class="widefat page fixed" cellspacing="0">
+  <thead>
+  <tr>
+<?php print_column_headers('edit-pages'); ?>
+  </tr>
+  </thead>
+
+  <tfoot>
+  <tr>
+<?php print_column_headers('edit-pages', false); ?>
+  </tr>
+  </tfoot>
+
+  <tbody>
+  <?php page_rows($posts, $pagenum, $per_page); ?>
+  </tbody>
+</table>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links_text</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+</div>
+
+<br class="clear" />
+</div>
+
+<?php } else { ?>
+<div class="clear"></div>
+<p><?php _e('No pages found.') ?></p>
+<?php
+} // end if ($posts)
+?>
+
+</form>
+
+<?php inline_edit_row( 'page' ) ?>
+
+<div id="ajax-response"></div>
+
+
+<?php
+
+if ( 1 == count($posts) && is_singular() ) :
+
+	$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
+	if ( $comments ) :
+		// Make sure comments, post, and post_author are cached
+		update_comment_cache($comments);
+		$post = get_post($id);
+		$authordata = get_userdata($post->post_author);
+	?>
+
+<br class="clear" />
+
+<table class="widefat" cellspacing="0">
+<thead>
+  <tr>
+    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
+    <th scope="col" class="column-author"><?php _e('Author') ?></th>
+    <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
+  </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+	foreach ($comments as $comment)
+		_wp_comment_row( $comment->comment_ID, 'single', false, false );
+?>
+</tbody>
+</table>
+
+<?php
+wp_comment_reply();
+endif; // comments
+endif; // posts;
+
+?>
+
+</div>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+columns.init('edit-pages');
+/* ]]> */
+</script>
+
+<?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/edit-post-rows.php b/mp-wp/wp-admin/edit-post-rows.php
--- a/mp-wp/wp-admin/edit-post-rows.php false
+++ b/mp-wp/wp-admin/edit-post-rows.php 751d64a408e07584db1439e7c7876ce1ad75f08b72ecfaecda510f4be8f6e22e834e106a7206eda4843c3bf653739adc97d677e6d9bb59a39bb82f7307144764
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Edit posts rows table for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( ! defined('ABSPATH') ) die();
+?>
+<table class="widefat post fixed" cellspacing="0">
+	<thead>
+	<tr>
+<?php print_column_headers('edit'); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+<?php print_column_headers('edit', false); ?>
+	</tr>
+	</tfoot>
+
+	<tbody>
+<?php post_rows(); ?>
+	</tbody>
+</table>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/edit-tag-form.php b/mp-wp/wp-admin/edit-tag-form.php
--- a/mp-wp/wp-admin/edit-tag-form.php false
+++ b/mp-wp/wp-admin/edit-tag-form.php ae5a3011fb4edb8b03ae447c66caa63e1229699779a90b6d3b443856b398e06ff32da29df8291f4ed0b4481b7f2e2e46f129f52ae8be1839fe1d8f59dd3352c8
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Edit tag form for inclusion in administration panels.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+if ( empty($tag_ID) ) { ?>
+	<div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div>
+<?php
+	return;
+}
+
+do_action('edit_tag_form_pre', $tag); ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e('Edit Tag'); ?></h2>
+<div id="ajax-response"></div>
+<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
+<input type="hidden" name="action" value="editedtag" />
+<input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
+	<table class="form-table">
+		<tr class="form-field form-required">
+			<th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
+            <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
+		</tr>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
+			<td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
+            <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
+		</tr>
+	</table>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Tag'); ?>" /></p>
+<?php do_action('edit_tag_form', $tag); ?>
+</form>
+</div>
diff -uNr a/mp-wp/wp-admin/edit-tags.php b/mp-wp/wp-admin/edit-tags.php
--- a/mp-wp/wp-admin/edit-tags.php false
+++ b/mp-wp/wp-admin/edit-tags.php 833b9f3f31940bd4a8c6b81df47b3e75faec7310aa7a956e2c0f2c77f94b10c87da4a8ed357f50b33eb06275b1849fb664fc4acf0d0538c55efb91f9c1de70af
@@ -0,0 +1,306 @@
+<?php
+/**
+ * Edit Tags Administration Panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('admin.php');
+
+$title = __('Tags');
+
+wp_reset_vars( array('action', 'tag') );
+
+if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
+	$action = 'bulk-delete';
+
+switch($action) {
+
+case 'addtag':
+
+	check_admin_referer('add-tag');
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	$ret = wp_insert_term($_POST['name'], 'post_tag', $_POST);
+	if ( $ret && !is_wp_error( $ret ) ) {
+		wp_redirect('edit-tags.php?message=1#addtag');
+	} else {
+		wp_redirect('edit-tags.php?message=4#addtag');
+	}
+	exit;
+break;
+
+case 'delete':
+	$tag_ID = (int) $_GET['tag_ID'];
+	check_admin_referer('delete-tag_' .  $tag_ID);
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	wp_delete_term( $tag_ID, 'post_tag');
+
+	wp_redirect('edit-tags.php?message=2');
+	exit;
+
+break;
+
+case 'bulk-delete':
+	check_admin_referer('bulk-tags');
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	$tags = $_GET['delete_tags'];
+	foreach( (array) $tags as $tag_ID ) {
+		wp_delete_term( $tag_ID, 'post_tag');
+	}
+
+	$location = 'edit-tags.php';
+	if ( $referer = wp_get_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
+	}
+
+	$location = add_query_arg('message', 6, $location);
+	wp_redirect($location);
+	exit;
+
+break;
+
+case 'edit':
+	$title = __('Edit Tag');
+
+	require_once ('admin-header.php');
+	$tag_ID = (int) $_GET['tag_ID'];
+
+	$tag = get_term($tag_ID, 'post_tag', OBJECT, 'edit');
+	include('edit-tag-form.php');
+
+break;
+
+case 'editedtag':
+	$tag_ID = (int) $_POST['tag_ID'];
+	check_admin_referer('update-tag_' . $tag_ID);
+
+	if ( !current_user_can('manage_categories') )
+		wp_die(__('Cheatin&#8217; uh?'));
+
+	$ret = wp_update_term($tag_ID, 'post_tag', $_POST);
+
+	$location = 'edit-tags.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
+	}
+
+	if ( $ret && !is_wp_error( $ret ) )
+		$location = add_query_arg('message', 3, $location);
+	else
+		$location = add_query_arg('message', 5, $location);
+
+	wp_redirect($location);
+	exit;
+break;
+
+default:
+
+if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+$can_manage = current_user_can('manage_categories');
+
+wp_enqueue_script('admin-tags');
+if ( $can_manage )
+	wp_enqueue_script('inline-edit-tax');
+
+require_once ('admin-header.php');
+
+$messages[1] = __('Tag added.');
+$messages[2] = __('Tag deleted.');
+$messages[3] = __('Tag updated.');
+$messages[4] = __('Tag not added.');
+$messages[5] = __('Tag not updated.');
+$messages[6] = __('Tags deleted.'); ?>
+
+<div class="wrap nosubsub">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
+
+<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<form class="search-form" action="" method="get">
+<p class="search-box">
+	<label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>
+	<input type="text" class="search-input" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
+</p>
+</form>
+<br class="clear" />
+
+<div id="col-container">
+
+<div id="col-right">
+<div class="col-wrap">
+<form id="posts-filter" action="" method="get">
+<div class="tablenav">
+<?php
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
+if ( empty($pagenum) )
+	$pagenum = 1;
+
+$tagsperpage = apply_filters("tagsperpage",20);
+
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'pagenum', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => ceil(wp_count_terms('post_tag') / $tagsperpage),
+	'current' => $pagenum
+));
+
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-tags'); ?>
+</div>
+
+<br class="clear" />
+</div>
+
+<div class="clear"></div>
+
+<table class="widefat tag fixed" cellspacing="0">
+	<thead>
+	<tr>
+<?php print_column_headers('edit-tags'); ?>
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>
+<?php print_column_headers('edit-tags', false); ?>
+	</tr>
+	</tfoot>
+
+	<tbody id="the-list" class="list:tag">
+<?php
+
+$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
+
+$count = tag_rows( $pagenum, $tagsperpage, $searchterms );
+?>
+	</tbody>
+</table>
+
+<div class="tablenav">
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+</div>
+
+<br class="clear" />
+</div>
+
+<br class="clear" />
+</form>
+</div>
+</div><!-- /col-right -->
+
+<div id="col-left">
+<div class="col-wrap">
+
+<div class="tagcloud">
+<h3><?php _e('Popular Tags'); ?></h3>
+<?php
+if ( $can_manage )
+	wp_tag_cloud(array('link' => 'edit'));
+else
+	wp_tag_cloud();
+?>
+</div>
+
+<?php if ( $can_manage ) {
+	do_action('add_tag_form_pre'); ?>
+
+<div class="form-wrap">
+<h3><?php _e('Add a New Tag'); ?></h3>
+<div id="ajax-response"></div>
+<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">
+<input type="hidden" name="action" value="addtag" />
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?>
+
+<div class="form-field form-required">
+	<label for="name"><?php _e('Tag name') ?></label>
+	<input name="name" id="name" type="text" value="" size="40" aria-required="true" />
+    <p><?php _e('The name is how the tag appears on your site.'); ?></p>
+</div>
+
+<div class="form-field">
+	<label for="slug"><?php _e('Tag slug') ?></label>
+	<input name="slug" id="slug" type="text" value="" size="40" />
+    <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
+</div>
+
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p>
+<?php do_action('add_tag_form'); ?>
+</form></div>
+<?php } ?>
+
+</div>
+</div><!-- /col-left -->
+
+</div><!-- /col-container -->
+</div><!-- /wrap -->
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+/* ]]> */
+</script>
+
+<?php inline_edit_term_row('edit-tags'); ?>
+
+<?php
+break;
+}
+
+include('admin-footer.php');
+
+?>
diff -uNr a/mp-wp/wp-admin/edit.php b/mp-wp/wp-admin/edit.php
--- a/mp-wp/wp-admin/edit.php false
+++ b/mp-wp/wp-admin/edit.php bbbefedb7b0ec84bc08d76d8c775bcc351d6e3e58918f0f398dae35686be8e3e76b2581a0f64d800c14d96d4a99eedadad42a916463db6533932863b9b9457d8
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Edit Posts Administration Panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('admin.php');
+
+// Back-compat for viewing comments of an entry
+if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['page_id'] ) ) ) {
+	wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) );
+	exit;
+} else {
+	unset( $_redirect );
+}
+
+// Handle bulk actions
+if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
+	$doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+
+	switch ( $doaction ) {
+		case 'delete':
+			if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+				check_admin_referer('bulk-posts');
+				$deleted = 0;
+				foreach( (array) $_GET['post'] as $post_id_del ) {
+					$post_del = & get_post($post_id_del);
+
+					if ( !current_user_can('delete_post', $post_id_del) )
+						wp_die( __('You are not allowed to delete this post.') );
+
+					if ( $post_del->post_type == 'attachment' ) {
+						if ( ! wp_delete_attachment($post_id_del) )
+							wp_die( __('Error in deleting...') );
+					} else {
+						if ( !wp_delete_post($post_id_del) )
+							wp_die( __('Error in deleting...') );
+					}
+					$deleted++;
+				}
+			}
+			break;
+		case 'edit':
+			if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) {
+				check_admin_referer('bulk-posts');
+
+				if ( -1 == $_GET['_status'] ) {
+					$_GET['post_status'] = null;
+					unset($_GET['_status'], $_GET['post_status']);
+				} else {
+					$_GET['post_status'] = $_GET['_status'];
+				}
+
+				$done = bulk_edit_posts($_GET);
+			}
+			break;
+	}
+
+	$sendback = wp_get_referer();
+	if ( strpos($sendback, 'post.php') !== false ) $sendback = admin_url('post-new.php');
+	elseif ( strpos($sendback, 'attachments.php') !== false ) $sendback = admin_url('attachments.php');
+	if ( isset($done) ) {
+		$done['updated'] = count( $done['updated'] );
+		$done['skipped'] = count( $done['skipped'] );
+		$done['locked'] = count( $done['locked'] );
+		$sendback = add_query_arg( $done, $sendback );
+	}
+	if ( isset($deleted) )
+		$sendback = add_query_arg('deleted', $deleted, $sendback);
+	wp_redirect($sendback);
+	exit();
+} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+	 exit;
+}
+
+if ( empty($title) )
+	$title = __('Edit Posts');
+$parent_file = 'edit.php';
+wp_enqueue_script('inline-edit-post');
+
+list($post_stati, $avail_post_stati) = wp_edit_posts_query();
+
+require_once('admin-header.php');
+
+if ( !isset( $_GET['paged'] ) )
+	$_GET['paged'] = 1;
+
+if ( empty($_GET['mode']) )
+	$mode = 'list';
+else
+	$mode = attribute_escape($_GET['mode']); ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+</h2>
+
+<?php
+if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
+<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
+<div id="message" class="updated fade"><p>
+<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
+	printf( __ngettext( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
+	unset($_GET['updated']);
+}
+
+if ( isset($_GET['skipped']) && (int) $_GET['skipped'] )
+	unset($_GET['skipped']);
+
+if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
+	printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
+	unset($_GET['locked']);
+}
+
+if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
+	printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
+	unset($_GET['deleted']);
+}
+
+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
+?>
+</p></div>
+<?php } ?>
+
+<form id="posts-filter" action="" method="get">
+
+<ul class="subsubsub">
+<?php
+if ( empty($locked_post_status) ) :
+$status_links = array();
+$num_posts = wp_count_posts( 'post', 'readable' );
+$total_posts = array_sum( (array) $num_posts );
+$class = empty( $_GET['post_status'] ) ? ' class="current"' : '';
+$status_links[] = "<li><a href='edit.php' $class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>';
+
+
+foreach ( $post_stati as $status => $label ) {
+	$class = '';
+
+	if ( !in_array( $status, $avail_post_stati ) )
+		continue;
+
+	if ( empty( $num_posts->$status ) )
+		continue;
+	if ( isset($_GET['post_status']) && $status == $_GET['post_status'] )
+		$class = ' class="current"';
+
+	$status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>';
+}
+echo implode( " |</li>\n", $status_links ) . '</li>';
+unset( $status_links );
+endif;
+?>
+</ul>
+
+<p class="search-box">
+	<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+	<input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
+</p>
+
+<?php if ( isset($_GET['post_status'] ) ) : ?>
+<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
+<?php endif; ?>
+<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+
+<?php if ( have_posts() ) { ?>
+
+<div class="tablenav">
+<?php
+$page_links = paginate_links( array(
+	'base' => add_query_arg( 'paged', '%#%' ),
+	'format' => '',
+	'prev_text' => __('&laquo;'),
+	'next_text' => __('&raquo;'),
+	'total' => $wp_query->max_num_pages,
+	'current' => $_GET['paged']
+));
+
+?>
+
+<div class="alignleft actions">
+<select name="action">
+<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<?php wp_nonce_field('bulk-posts'); ?>
+
+<?php // view filters
+if ( !is_singular() ) {
+$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 ) ) {
+$m = isset($_GET['m']) ? (int)$_GET['m'] : 0;
+?>
+<select name='m'>
+<option<?php selected( $m, 0 ); ?> value='0'><?php _e('Show all dates'); ?></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 == $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>
+<?php } ?>
+
+<?php
+$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
+	'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
+wp_dropdown_categories($dropdown_options);
+do_action('restrict_manage_posts');
+?>
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+
+<?php } ?>
+</div>
+
+<?php if ( $page_links ) { ?>
+<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
+	number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
+	number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
+	number_format_i18n( $wp_query->found_posts ),
+	$page_links
+); echo $page_links_text; ?></div>
+<?php } ?>
+
+<div class="view-switch">
+	<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+	<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
+</div>
+
+<div class="clear"></div>
+</div>
+
+<div class="clear"></div>
+
+<?php include( 'edit-post-rows.php' ); ?>
+
+<div class="tablenav">
+
+<?php
+if ( $page_links )
+	echo "<div class='tablenav-pages'>$page_links_text</div>";
+?>
+
+<div class="alignleft actions">
+<select name="action2">
+<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<br class="clear" />
+</div>
+<br class="clear" />
+</div>
+
+<?php } else { // have_posts() ?>
+<div class="clear"></div>
+<p><?php _e('No posts found') ?></p>
+<?php } ?>
+
+</form>
+
+<?php inline_edit_row( 'post' ); ?>
+
+<div id="ajax-response"></div>
+
+<br class="clear" />
+
+</div>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+(function($){
+	$(document).ready(function(){
+		$('#doaction, #doaction2').click(function(){
+			if ( $('select[name^="action"]').val() == 'delete' ) {
+				var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				return showNotice.warn(m);
+			}
+		});
+	});
+})(jQuery);
+columns.init('edit');
+/* ]]> */
+</script>
+
+<?php include('admin-footer.php'); ?>
diff -uNr a/mp-wp/wp-admin/export.php b/mp-wp/wp-admin/export.php
--- a/mp-wp/wp-admin/export.php false
+++ b/mp-wp/wp-admin/export.php a5d4cac66409c5945ca8c3bf8a893ee1d18935f4cbffcb85dd30a305b5bd6a404b75b6372fd33242c7bfd752fbd6f8b6552eb522ec76fd9437bd43cfc0aefaed
@@ -0,0 +1,62 @@
+<?php
+/**
+ * WordPress Export Administration Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */
+require_once ('admin.php');
+
+/** Load WordPress export API */
+require_once('includes/export.php');
+$title = __('Export');
+
+if ( isset( $_GET['download'] ) ) {
+	$author = isset($_GET['author']) ? $_GET['author'] : 'all';
+	export_wp( $author );
+	die();
+}
+
+require_once ('admin-header.php');
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
+<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, pages, comments, custom fields, categories, and tags.'); ?></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('Options'); ?></h3>
+
+<table class="form-table">
+<tr>
+<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
+<td>
+<select name="author" id="author">
+<option value="all" selected="selected"><?php _e('All Authors'); ?></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" class="button" value="<?php _e('Download Export File'); ?>" />
+<input type="hidden" name="download" value="true" />
+</p>
+</form>
+</div>
+
+<?php
+
+
+include ('admin-footer.php');
+?>
diff -uNr a/mp-wp/wp-admin/gears-manifest.php b/mp-wp/wp-admin/gears-manifest.php
--- a/mp-wp/wp-admin/gears-manifest.php false
+++ b/mp-wp/wp-admin/gears-manifest.php a1d7ce2feb2b812e49b000c72033fb9ac3be61703f620f3eed46e0d8e90bd7c2a758e50a5d3c956dbbe1f89ae1e570263b2018161742059feffc325553c6ad48
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Defines the Gears manifest file for Google Gears offline storage.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Set ABSPATH for execution */
+define( 'ABSPATH', dirname(dirname(__FILE__)) );
+define( 'WPINC', '/wp-includes' );
+
+/**
+ * @ignore
+ */
+function __() {}
+
+/**
+ * @ignore
+ */
+function _c() {}
+
+/**
+ * @ignore
+ */
+function add_filter() {}
+
+/**
+ * @ignore
+ */
+function attribute_escape() {}
+
+/**
+ * @ignore
+ */
+function apply_filters() {}
+
+/**
+ * @ignore
+ */
+function get_option() {}
+
+/**
+ * @ignore
+ */
+function is_lighttpd_before_150() {}
+
+/**
+ * @ignore
+ */
+function add_action() {}
+
+/**
+ * @ignore
+ */
+function do_action_ref_array() {}
+
+/**
+ * @ignore
+ */
+function get_bloginfo() {}
+
+/**
+ * @ignore
+ */
+function is_admin() {return true;}
+
+/**
+ * @ignore
+ */
+function site_url() {}
+
+/**
+ * @ignore
+ */
+function admin_url() {}
+
+/**
+ * @ignore
+ */
+function wp_guess_url() {}
+
+require(ABSPATH . '/wp-includes/script-loader.php');
+require(ABSPATH . '/wp-includes/version.php');
+
+$wp_scripts = new WP_Scripts();
+wp_default_scripts($wp_scripts);
+
+$wp_styles = new WP_Styles();
+wp_default_styles($wp_styles);
+
+$defaults = $man_version = '';
+foreach ( $wp_scripts->registered as $script ) {
+	if ( empty($script->src) ) continue;
+	$ver = empty($script->ver) ? $wp_version : $script->ver;
+	if ( 'editor' == $script->handle ) $mce_ver = $script->ver;
+	$src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
+	$defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+	$man_version .= $ver;
+}
+
+foreach ( $wp_styles->registered as $style ) {
+	if ( empty($style->src) ) continue;
+
+	$ver = empty($style->ver) ? $wp_version : $style->ver;
+	$src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
+	if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
+	$defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+
+	if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
+		if ( is_bool( $style->extra['rtl'] ) )
+			$rtl_href = str_replace( '.css', '-rtl.css', $src );
+		else
+			$rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
+
+		$defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n";
+	}
+	$man_version .= $ver;
+}
+
+$man_version = md5($man_version);
+
+header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
+header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
+header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
+header( 'Pragma: no-cache' );
+header( 'Content-Type: application/x-javascript; charset=UTF-8' );
+?>
+{
+"betaManifestVersion" : 1,
+"version" : "<?php echo $man_version; ?>_20081201",
+"entries" : [
+<?php echo $defaults; ?>
+
+{ "url" : "images/align-center.png.svg" },
+{ "url" : "images/align-left.png.svg" },
+{ "url" : "images/align-none.png.svg" },
+{ "url" : "images/align-right.png.svg" },
+{ "url" : "images/archive-link.png.svg" },
+{ "url" : "images/blue-grad.png.svg" },
+{ "url" : "images/browse-happy.gif.svg" },
+{ "url" : "images/bubble_bg.gif.svg" },
+{ "url" : "images/bubble_bg-rtl.gif.svg" },
+{ "url" : "images/button-grad.png.svg" },
+{ "url" : "images/button-grad-active.png.svg" },
+{ "url" : "images/comment-grey-bubble.png.svg" },
+{ "url" : "images/date-button.gif.svg" },
+{ "url" : "images/ed-bg.gif.svg" },
+{ "url" : "images/fade-butt.png.svg" },
+{ "url" : "images/fav.png.svg" },
+{ "url" : "images/fav-arrow.gif.svg" },
+{ "url" : "images/fav-arrow-rtl.gif.svg" },
+{ "url" : "images/fav-top.png.svg" },
+{ "url" : "images/generic.png.svg" },
+{ "url" : "images/gray-grad.png.svg" },
+{ "url" : "images/icons32.png.svg" },
+{ "url" : "images/icons32-vs.png.svg" },
+{ "url" : "images/list.png.svg" },
+{ "url" : "images/list-vs.png.svg" },
+{ "url" : "images/loading.gif.svg" },
+{ "url" : "images/loading-publish.gif.svg" },
+{ "url" : "images/logo.gif.svg" },
+{ "url" : "images/logo-ghost.png.svg" },
+{ "url" : "images/logo-login.gif.svg" },
+{ "url" : "images/media-button-image.gif.svg" },
+{ "url" : "images/media-button-music.gif.svg" },
+{ "url" : "images/media-button-other.gif.svg" },
+{ "url" : "images/media-button-video.gif.svg" },
+{ "url" : "images/menu.png.svg" },
+{ "url" : "images/menu-vs.png.svg" },
+{ "url" : "images/menu-arrows.gif.svg" },
+{ "url" : "images/menu-bits.gif.svg" },
+{ "url" : "images/menu-bits-rtl.gif.svg" },
+{ "url" : "images/menu-dark.gif.svg" },
+{ "url" : "images/menu-dark-rtl.gif.svg" },
+{ "url" : "images/no.png.svg" },
+{ "url" : "images/required.gif.svg" },
+{ "url" : "images/resize.gif.svg" },
+{ "url" : "images/screen-options-left.gif.svg" },
+{ "url" : "images/screen-options-right.gif.svg" },
+{ "url" : "images/screen-options-right-up.gif.svg" },
+{ "url" : "images/se.png.svg" },
+{ "url" : "images/star.gif.svg" },
+{ "url" : "images/toggle-arrow.gif.svg" },
+{ "url" : "images/toggle-arrow-rtl.gif.svg" },
+{ "url" : "images/white-grad.png.svg" },
+{ "url" : "images/white-grad-active.png.svg" },
+{ "url" : "images/wordpress-logo.png.svg" },
+{ "url" : "images/wp-logo.gif.svg" },
+{ "url" : "images/xit.gif.svg" },
+{ "url" : "images/yes.png.svg" },
+
+<?php if ( is_file('../wp-includes/js/tinymce/tiny_mce.js') ) { ?>
+{ "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/langs/wp-langs-en.js", "src" : "../wp-includes/js/tinymce/langs/wp-langs-en.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/wordpress.css", "src" : "../wp-includes/js/tinymce/wordpress.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js", "src" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/utils/validate.js", "src" : "../wp-includes/js/tinymce/utils/validate.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js", "src" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js", "src" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js", "src" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js", "src" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js", "src" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm", "src" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/fm.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/sflogo.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flash.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flv_player.swf" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/quicktime.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/realmedia.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png.svg" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png.svg" },
+<?php } ?>
+
+{ "url" : "../wp-includes/images/crystal/archive.png.svg" },
+{ "url" : "../wp-includes/images/crystal/audio.png.svg" },
+{ "url" : "../wp-includes/images/crystal/code.png.svg" },
+{ "url" : "../wp-includes/images/crystal/default.png.svg" },
+{ "url" : "../wp-includes/images/crystal/document.png.svg" },
+{ "url" : "../wp-includes/images/crystal/interactive.png.svg" },
+{ "url" : "../wp-includes/images/crystal/text.png.svg" },
+{ "url" : "../wp-includes/images/crystal/video.png.svg" },
+{ "url" : "../wp-includes/images/crystal/spreadsheet.png.svg" },
+{ "url" : "../wp-includes/images/rss.png.svg" },
+{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif.svg" },
+{ "url" : "../wp-includes/js/thickbox/tb-close.png.svg" }
+]}
diff -uNr a/mp-wp/wp-admin/images/align-center.svg b/mp-wp/wp-admin/images/align-center.svg
--- a/mp-wp/wp-admin/images/align-center.svg false
+++ b/mp-wp/wp-admin/images/align-center.svg 5eb028786be92b0ab628c42a5b35420a0cbf5e807717ed7bc1f17c0b1891ef666619a834a5d19d7bd6f7a86a2c5d68b89778848552a27b8c811d8168582ce298
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="21px" height="15px" viewBox="0 0 21 15" enable-background="new 0 0 21 15" xml:space="preserve">  <image id="image0" width="21" height="15" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABUAAAAPCAIAAACEOBM8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
+7UlEQVQokY2ST2sUQRDFq2u6p2djIoQcFPbk3Yt+Bg3CrrDgxxQxDhskH0G8eo8kmyUkEhOT3cx0
+Vdfz0LrEPyv+Dg3VVPd7r7oJyJcAJCWIAQJAFgZkKBISJBvQQw2SugVgZviJmTnkpXLj4dRRReqo
+//Dq8YCtTizacVOb8KbagmOK7umbj0T3VdV7X1ZPbnA5u0p+CauYUh+qBx2Jc8IBTXa9Rc+LcMsb
+vH2F+WGmOGfmIj4cDj2p9O5m+HAnU1NlIqZPrBLQ6AbZZud0QDn29VfXdKF/8qh2tE1EOefz83Mi
+8l0IQhWRf9/u1656/uIZ8c4G5BZftnhLyMRAA94yC9WmU7c33Ysx7u7umhkReZDcYxLw+OWIQEQX
+AIJcVLG57buqGlCKHDu+XnyLkbxNJhMAtAKCw9lnYPm2ff1ub78HoFgimS2hUAAZateKBHQLoG3b
+tm0BzOdzAJRzPjk5wa8PU8p1lIbj42MAnpnL7sHBQUqJmct4qqqiv1EaRqPRjzqldHZ2dlc/5/wP
+/ZXB4tqHELquI6LpdCoiTdOUK4rOn5gZM4/H4zJ/AnB0dHQ3uariP5jNZgAYQAihZC721iVf6RdV
+7z0A75xT1dPTUxGp63qVfJ3/0h9CyDkTkbv7GYqxdSd/A4Bz7juq2xMIx6ti1QAAAABJRU5ErkJg
+gg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/align-left.svg b/mp-wp/wp-admin/images/align-left.svg
--- a/mp-wp/wp-admin/images/align-left.svg false
+++ b/mp-wp/wp-admin/images/align-left.svg 15308380bd59d3dc8f0aa7667787e34f47bd8ed8da2d3494785cf9fd295f5b413903d20cf077eb59d43c03b02e90982c3ea908e54174021931c5e10cd195667b
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="22px" height="15px" viewBox="0 0 22 15" enable-background="new 0 0 22 15" xml:space="preserve">  <image id="image0" width="22" height="15" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABYAAAAPCAIAAABvD6g/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
+/UlEQVQokX1SPW8TQRSctx++s00SAUKKZGo6Kv6EkSKUhoJfSEEBimQJOn4ALT1SHDmypQiIfee7
+3feGYuFIEecVr9md2ZmdQUuS+6SZ5JZkkxPJnsxk06gyk0xMJBNVlSRJMxu2cL/9/u6VaCtorJqE
+ZI35mpPf6Kvp9OX7bzQnzjtACAgAmJmIiAhJEQn7ajrt3FaqajRODbvQ1uLF/RwhH2+3P1Y3T9pq
+N83s2xg15yAi3ntVFRFVnc1moSZ27jZUVffr1o1PokoaxaNdL/WjNOpfnB4Lqqm4DEzQAuPyspkB
+2Gw2AAJkaz6qaTgaC0Q6HnVdNznRlIxjMcLj84dPYTJJ0kSMcs4iAuDs7MzMnHMBQJLHQW/A3hNa
+R21N+p2Evg1P4fsM9+btayS3i3Fs5pwrSAAASErLfU2s1pvTZ8/NwRN72VesIZ3YyESS2NePX1pf
+RSRFF0LIOZvZ+fn51dXVbDZDCeby8vJuVIdmSPQuKhRj3nszWywW3vvB7b1TgnDOzefzYgQkVXW1
+WhX6nPMDQsrlQcv19TXJUJhKSBcXFyRjjCTvlWBmIQRV9d7P5/Ocs6qiUC6Xy8FqEXJoVHUQslwu
+Sbq/wfwrbErJe3/oI0g65wbVBRKGzq/X65xzCKHruodZymlRZGZSbBchZR8C/++SSHm4FOwPudIR
+DMrRWe8AAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/align-none.svg b/mp-wp/wp-admin/images/align-none.svg
--- a/mp-wp/wp-admin/images/align-none.svg false
+++ b/mp-wp/wp-admin/images/align-none.svg 735972b4215caa53459687b05891967c779a79ccd773e7728ed0e29263110efd5e19f08d057f5383cb488bc8ae8b0a6971012bda40acdc5b72e7e7fddbdea9ab
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="21px" height="15px" viewBox="0 0 21 15" enable-background="new 0 0 21 15" xml:space="preserve">  <image id="image0" width="21" height="15" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABUAAAAPCAIAAACEOBM8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
+d0lEQVQokY2RPW4UQRCFX/30DLshu7IWIlIO4Sv4ipyBQ3AGMosES/aARIDNznRXPYJZzSZtyaVK
+Wqqv3utXQjIzSaqqiAAINPQq4IbZLq+CVLB5Zk7TtG0B4LQun1HE/s4lVBwzXccPH09OkuTxeHT3
+dY5dGhACOBAMSYE9/XzIoKpqZq7wqi+vNPC4CKSJNyNgLup0EVkxkuv/v9996ur/2p9uv3zjzoAa
+KG1eFqRf7YkAyMzQvv+b5x8YM6q5N5Pi7m3jL85FVFXZT2CWAoUoou5QUId/+8U8MzdxABEBli4/
+iqOeUcTM0VCfiYPp9ewRAFQVkt3+PZ4QoyGWeKHD3u3PgmvsWwqfv9539YXTIsNQ56EUBHY1CvJy
+fwBmBqC15t4PcJGDN8Ctgc0Q7oHmANw9Ilbe3cHo6wvp2kCneOW5esFwyW+apsxct4T283t/Xqrz
+jzUPZRlF6g6Qzf92AkT/fi8m+0oWkcBsOSLaynen31j/ASF25K35/sRLAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/align-right.svg b/mp-wp/wp-admin/images/align-right.svg
--- a/mp-wp/wp-admin/images/align-right.svg false
+++ b/mp-wp/wp-admin/images/align-right.svg c8022e9a080cec5be106e51cd5cd452ea9183161944ff5db2e5788de55b2b852c55097286bebd07ffe7c62d2302a8ac3fddd56674f251fe1f31c96c0859c905f
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="22px" height="15px" viewBox="0 0 22 15" enable-background="new 0 0 22 15" xml:space="preserve">  <image id="image0" width="22" height="15" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABYAAAAPCAIAAABvD6g/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAB
+3klEQVQokY2TQW4TQRBFq6qrPZPYSRQpUlYsOAILzpAskhWH5ABRfAvgCtiS5SyABdgZ93RXfRZF
+RkJgxFu0ukdT8//8qmZ3Z2Z6AQARMfO0eSaa1cLapUqeybjlqp6NSMRLk54BxNtRQL8DgPnHx3dv
+ZwVzLzsVyeSHQ9b+oK2l7s37Dwrg6emJiETEzKbilFKtlZl5PL0cynDB++eh43krhj57zSeDdWwt
+XSgAEbm6ugKgqq01VQVgZqpKRKD9pyxt6C5Lbb0cOKsrE5U5t2IzI2Xm1lpK6eHhIcTHcVRVZmbm
+m5ubBD5Pi2qlnUgzPyVk8Z3teL/g7pyFdHJ+f39PRGaWUorV3UWEyL8bnZW9n/V06DErQxnmsxOl
+YecLwjcGsN1ur6+vl8tl5GpmOefo1N3d3TPRKRUjIZSEhQklI8jw+euX1+evxhkRgNVqBcCPYGYA
+Wmt4IZ5sNps4KhGpqpktl0s6QkRba00piQgz397eisivP22tbbfbf7gIqdjEWmsNF3HUlFJE8Pj4
++FcLzDyOY9/34cLdp+yjm2Rm6/Uax5n0zSxSiDjCOwAVkRihY8TUxwROXReRWms40lDYbDZ/XpDA
+3UPDzGLeoqTruvgoT3fsPwEQYmEHwE+XqstggPB53AAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/archive-link.svg b/mp-wp/wp-admin/images/archive-link.svg
--- a/mp-wp/wp-admin/images/archive-link.svg false
+++ b/mp-wp/wp-admin/images/archive-link.svg 47415221e0cf7e554e014a1adf52c34a52e789280d2a5898356018a9dd3c150414fd3d13969a62b4da50365ce9d5c878750bd9b143803ce92aa28d57c6beaaf0
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">  <image id="image0" width="14" height="14" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAAAZQTFRF////3t7erAXcBgAAABVJREFUeNpiYEQBDIwMKGAIcgECDAAR
+LQAcvE1yYQAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/blue-grad.svg b/mp-wp/wp-admin/images/blue-grad.svg
--- a/mp-wp/wp-admin/images/blue-grad.svg false
+++ b/mp-wp/wp-admin/images/blue-grad.svg 1e690237f7c4bb8e9a3ce79dff2d0581f30a08e0c6d50052421a67c548fa09b9cefcd40f03520bb6466f6cd69ad3c7fa65b0b14363c909170f71d0cc0a59d4e5
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="31px" viewBox="0 0 5 31" enable-background="new 0 0 5 31" xml:space="preserve">  <image id="image0" width="5" height="31" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAfCAYAAAAvIgcYAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAK8AAACvABQqw0mAAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMC8yNC8wOCkOq/sAAAAhdEVYdFNv
+ZnR3YXJlAE1hY3JvbWVkaWEgRmlyZXdvcmtzIDQuMOomJ3UAAABFSURBVHicY7z2/vN/BjTAhC7A
+wMDAwPL/HzZBDM0MDCz/sIhiV0m8mSQI/iPadhLMxCKIxR4Glv9D2e//KHUSNtuJNRMAyolC5QTM
+SKoAAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/browse-happy.svg b/mp-wp/wp-admin/images/browse-happy.svg
--- a/mp-wp/wp-admin/images/browse-happy.svg false
+++ b/mp-wp/wp-admin/images/browse-happy.svg 95bf28d321cb06447c476df3c68393222c78f8d4d8de2b2fd5e55df7d046f02750a0b57b16351f596f3f83cc311338767e3c49db55f47c4b418d0d91dc314bc3
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="120px" height="32px" viewBox="0 0 120 32" enable-background="new 0 0 120 32" xml:space="preserve">  <image id="image0" width="120" height="32" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/bubble_bg-rtl.svg b/mp-wp/wp-admin/images/bubble_bg-rtl.svg
--- a/mp-wp/wp-admin/images/bubble_bg-rtl.svg false
+++ b/mp-wp/wp-admin/images/bubble_bg-rtl.svg 1458b828946e161e4e7292138672215763414b173ff6137e3201ebf3cabe3ba4ad961b11493c266383ab124b9e9c535b1912e99f90d7829539746b985557712f
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="100px" viewBox="0 0 18 100" enable-background="new 0 0 18 100" xml:space="preserve">  <image id="image0" width="18" height="100" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEgBkANUAACZHYWmqx9VOISWDreqnkNfo8L+/v9pkPTOLsszMzKGvumqBk8TExOKGZ5Oj
+sLzGzqDJ2zRTa9fd4vLy8vLIupLB1thZL0CTt+2ynvfe1ubm5rvZ5vf390FedeTw9a66xOWRda7R
+4O+9rHeyzNXV1frp5E6avOXp7N3d3f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACkALAAAAAASAGQAAAatwJRw
+SCwaj8ikcslsOp/QqHRKrR4PgmyWCdJulxivgFmyeJuUc5OgfTa+Tiw0Y4mKrPi8fs/v+/9/EQCD
+g0wLhIVLCogATCeChE0PiE4OkU6HjU8dmk4SEVEfgKOkpaanqKmqVSYDrq5MI6+wSxCzA0weCLNN
+G7xNFa9PAbROF7hPBQhRIavOz9DR0nwMBtbWTCTX2Eso2wZMHN9NJ9tO3txNCelN1VAT4FAaSEEA
+Ow==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/bubble_bg.svg b/mp-wp/wp-admin/images/bubble_bg.svg
--- a/mp-wp/wp-admin/images/bubble_bg.svg false
+++ b/mp-wp/wp-admin/images/bubble_bg.svg 2c0ebd8b382a31d83969f12bc22a5682f66cdab01351159cc78a9de5cac269d09a90757253fa15228900c94683c3ae82c89b823fe6778f1914ad775b2f508252
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="100px" viewBox="0 0 18 100" enable-background="new 0 0 18 100" xml:space="preserve">  <image id="image0" width="18" height="100" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEgBkANUAACZHYWmqx9VOISWDreqnkNfo8L+/v9pkPTOLsszMzKGvumqBk8TExOKGZ5Oj
+sLzGzqDJ2zRTa9fd4vLy8vLIupLB1thZL0CTt+2ynvfe1ubm5rvZ5vf390FedeTw9a66xOWRda7R
+4O+9rHeyzNXV1frp5E6avOXp7N3d3f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUUACkALAAAAAASAGQAAAaowJRw
+SCwaj8ikcslsOp/QqHRKrS4FWOyBmcWCuF0MGGspjQWUZpbgxDaegu3TkoGKrPi8fs/v+/+ARACD
+gxFMhIMLh4gKi4UnjgAPTYQOTolPAB1QERJQH4GhoqOkpaanqFEDq6smTKyrI6+wELOrCB62AxtN
+rBVOqwFPAxdQCAVQIanLzM3Oz3sG0tIMTNPSJNbXKNrTHN0GkN3cTdIJTwbV6BNQGklBADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/button-grad-active.svg b/mp-wp/wp-admin/images/button-grad-active.svg
--- a/mp-wp/wp-admin/images/button-grad-active.svg false
+++ b/mp-wp/wp-admin/images/button-grad-active.svg 7329a55ffc02e2ba75e7c94f5c35908caf8c2703ec8e7f2f1a310df6c8dc332e2f31e16d1418f84842836dbb151d4335f4e07a4d42b54a4bd312cce538e2a3da
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAMAAADToCSPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAAGNQTFRFI3mhI3adInOZKYy6KIq3IG2SJoCqHmWHIXCWJX2mI3efJX6o
+JHykJ4ayKIezKIi1H2iKJ4SwIW+UJoOuH2mMHWOFIXKXJoGsKYu5InSbIGyQH2qOJHqjHmaIHmaJ
+JHqiH2uOg3njkwAAAE9JREFUeNokwYkWQlAAANGxla1EUXgP//+VmuNeRnEXMcZt4yU+Yv07WEQh
+BlGKSaRiFomoxWXfQwi0ohKNuImveItePMRTdCIXP5HpFGAAQOsIjXQqwS4AAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/button-grad.svg b/mp-wp/wp-admin/images/button-grad.svg
--- a/mp-wp/wp-admin/images/button-grad.svg false
+++ b/mp-wp/wp-admin/images/button-grad.svg 6ded172baa6201f5368db65eab26c2b0edfd11cd5d2137fbd06e10af6b6219cc1c89d1ecef384abe9e3a81478bc9b096fde12e841b589afa0da610c74eea8c3c
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAALEgAACxIB0t1+/AAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
+dQAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8xNy8wONpsdXEAAABGSURBVHicY9Ts2fWfAQ2wMPzH
+EGNg+f//H6Ygwz9sgthU/sdmJlbtlFpEgpOwWoTszv+Dz0lUtOg/ukoSfATT+5+gSkxBAOqCS3dT
+eDKPAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/comment-grey-bubble.svg b/mp-wp/wp-admin/images/comment-grey-bubble.svg
--- a/mp-wp/wp-admin/images/comment-grey-bubble.svg false
+++ b/mp-wp/wp-admin/images/comment-grey-bubble.svg f01d4e9427128b2f04d180a95f5d46417270bb9976c7ee89037f1498d3f4e8c2ce965e88ce855c1e60dc19e5b8f7ffa5cd897abb3eb25418cf67cc39d245d500
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" enable-background="new 0 0 12 12" xml:space="preserve">  <image id="image0" width="12" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAMAAABhq6zVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAAAZQTFRFRkZGcnJy4d1N7AAAAAF0Uk5TAEDm2GYAAAAhSURBVHjaYmBg
+hAMGJDaQR10Oij1ggGCBOQxIHAgFEGAAKMYAb8OafsEAAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/date-button.svg b/mp-wp/wp-admin/images/date-button.svg
--- a/mp-wp/wp-admin/images/date-button.svg false
+++ b/mp-wp/wp-admin/images/date-button.svg b415bf0541005728b3db692740ae81218ba4af011e68602c4fae3477d8c2b892a1ccc2404340d1f588dff713ffab86c5dff5195b03d51b5d110ce74a06ebf6fc
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="13px" viewBox="0 0 13 13" enable-background="new 0 0 13 13" xml:space="preserve">  <image id="image0" width="13" height="13" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhDQANAKIHAL7Dx5icn2RkZK+vr83NzZaanf///////yH5BAEAAAcALAAAAAANAA0AAAM0
+eCqg26dIISuVgRChOyeS9nla2J2diZ6S4b6w0RrD4NbvTL+2q/c7X+GGq/V0sVxlySwkAAA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/ed-bg.svg b/mp-wp/wp-admin/images/ed-bg.svg
--- a/mp-wp/wp-admin/images/ed-bg.svg false
+++ b/mp-wp/wp-admin/images/ed-bg.svg 43e8bd8b02cba89a8a7312981120fb123a744c147fcb388931b42b414245a29d1be8926140b498169cbc6693ccc8e3d6e90f6aa95972e5e83b8e47ba68d2e717
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="37px" viewBox="0 0 20 37" enable-background="new 0 0 20 37" xml:space="preserve">  <image id="image0" width="20" height="37" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhFAAlALMAAOnp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f3////wAAAAAAAAAA
+AAAAACH5BAUUAAsALAAAAAAUACUAAARrEMhJaw046827/+AmjGRpnmiqrmw7DnAsz3Rt3/hM7Hzv
+/8CgcOgrGI/IpHLJbDqThqh0Sq1ar9isdhs9eL/gsHhMLpvPaC9izW673/C4fE6vrxP4vH7P7/v/
+gIGCg38KhoeIiYqLjI2OiREAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/fade-butt.svg b/mp-wp/wp-admin/images/fade-butt.svg
--- a/mp-wp/wp-admin/images/fade-butt.svg false
+++ b/mp-wp/wp-admin/images/fade-butt.svg 47480c18c0d6f5e496943c4ad0d64daff7caea30eb49fcf203d5710c80212e498a046dafd51f1d342cb18e15b38c56b60122c1a9a8b45f67501959f6afeff926
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="40px" viewBox="0 0 20 40" enable-background="new 0 0 20 40" xml:space="preserve">  <image id="image0" width="20" height="40" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABQAAAAoCAMAAADJ7yrpAAAABGdBTUEAAK/INwWK6QAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADqUExURe3s7PX19e7t7fz8/Orp6fDv7/Py
+8vf39/r6+uzr6/Ly8vj4+PTz9PHw8PHw8fT08/38/Orq6unp6fn4+fb19fHx8Pf29+zs7PT09O/v
+7/f39uzr6vLy8fn4+Pn6+vTz8+vr6/X19urp6uzq6u7u7u/t7fr6+fz9/Orp6Ovq6urq6ero6O/u
+7/j4+fj5+Pf29u7u7e/v7vr5+evq6+vq6ezq6/Px8vPy8fz7+/r5+vDx8Pn5+u/u7vDv7vb29uvp
+6vDu7/n5+Ovp6fDw8fz8/fDu7u/t7u7t7vn5+fX29f39/PHx8fv7++no6P8MrTIAAAGtSURBVHja
+YhBwEVAXYBZgBiJ1ZiAQ8FJnBgggBh8kYAGlAQKIgcNDTY4DiDjk1DiMOOSA2NoSIIAYuGV1uYVl
+ZbmFHYX1uLn1hGWFdbkBAohBil1fSopdSkyKnV1fTIwdCMTEAAKIgREIRBRFwKSnCCOQZccIEEAM
+8vzyPPwSPECSR0KCn0eCH0gABBADF5sMGxcXGxuXGRubDJApw2bOBRBADHyifKLOfHy8vHy83lZ8
+ory8vKKiAAHEoKPjwGpoKMkqacsqKckKApKuAAHE4MZkwMSkaqDizsSkosJkA2SrMgEEEAODOIO4
+OAMEiENJgABi4FTglDZVVuDklJZWllYwVubk5DQGCCAGFidBQU17QS1BE00tE0ElJU0tQSWAAGIQ
+YhESEmJhYdHQBmIgS4NFWxsggBh8sQCAAMIqCBBAWAUBAgirIEAAYRUECCCsggABhFUQIICwCgIE
+EFZBgADCKggQQFgFAQIIqyBAAGEVBAggrIIAAYRVECCAsAoCBBBWQYAAwioIEEBYBQECCKsgQABh
+FQQIIKyCAAGEVRAggLAKAgQQVkGAAAMAS+S0diV/RlUAAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-arrow-rtl.svg b/mp-wp/wp-admin/images/fav-arrow-rtl.svg
--- a/mp-wp/wp-admin/images/fav-arrow-rtl.svg false
+++ b/mp-wp/wp-admin/images/fav-arrow-rtl.svg 3263e01dcc3f5a9c859de6328923d61aaf120658b5e6a5770dd68ffedac7651d82d94038678c91e359574944c1752fdf42333492775d9f6675e270511430cfb3
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="32px" viewBox="0 0 17 32" enable-background="new 0 0 17 32" xml:space="preserve">  <image id="image0" width="17" height="32" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEQAgAPUnAFJSUlNTU1ZWVldXV1hYWFlZWVpaWlxcXF5eXmBgYGJiYmRkZGZmZmhoaGlp
+aWpqamtra2xsbG5ubnBwcHJycnR0dHZ2dnd3d3t7e35+fn9/f4eHh5KSkpmZmampqbOzs7a2tsHB
+wcLCwsnJyczMzNDQ0NHR0QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C0lDQ1JHQkcxMDEySAAADEhMaW5v
+AhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAA
+AAABAAD21gAh+QQFAAAnACwAAAAAEQAgAAAGa8CTcEgsnjDG5BCpTDKbxSd0OY1WidJqdnq5Di1e
+YSV8opAnpxFpvQ4pJQSOaT7vKCMOgogOaj5OAxpzJRtNDScPAB8mHlAMQgYPI1tEC0IRARlTCkMQ
+VQlkCGQHZAZkBWQDZAKrrWGsr6tBADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-arrow.svg b/mp-wp/wp-admin/images/fav-arrow.svg
--- a/mp-wp/wp-admin/images/fav-arrow.svg false
+++ b/mp-wp/wp-admin/images/fav-arrow.svg c73ace37b7042e790d1ec676adc9f17ba6628bedac5e85172af2b3981cf5ce97b45242f8d23822f4ddfff2516fce4ffebd1c089fa22f125d64f20c0fee83eb69
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="32px" viewBox="0 0 17 32" enable-background="new 0 0 17 32" xml:space="preserve">  <image id="image0" width="17" height="32" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEQAgAPUnAFJSUlNTU1ZWVldXV1hYWFlZWVpaWlxcXF5eXmBgYGJiYmRkZGZmZmhoaGlp
+aWpqamtra2xsbG5ubnBwcHJycnR0dHZ2dnd3d3t7e35+fn9/f4eHh5KSkpmZmampqbOzs7a2tsHB
+wcLCwsnJyczMzNDQ0NHR0QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUAACcALAAAAAARACAAAAZrQMxp
+SCwaT8KjcphcHpvOIjTKpBqnVGz0Yi1ausQKeEgZnyZmyTJEardHp8iyY6rXOYSHE2QXERwNThsl
+dRoDJwxRHiYfAHoLURgjDwZDClQZAXInCVYQRAhmB2aVYwVmh2MCZquqrK+uY0EAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/fav-top.svg b/mp-wp/wp-admin/images/fav-top.svg
--- a/mp-wp/wp-admin/images/fav-top.svg false
+++ b/mp-wp/wp-admin/images/fav-top.svg ca31c35f470bcd4b2df76e90001c4c10b7d05023cb1729bd557556d0847818d881057ed651b98c8092bd7e18355cfb51baa4eb2467b9396f309b7c55d5da4143
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="3px" height="12px" viewBox="0 0 3 12" enable-background="new 0 0 3 12" xml:space="preserve">  <image id="image0" width="3" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAMAAAAMBAMAAABVUBpZAAAAJFBMVEWRkZGQkJCOjo6NjY2Li4uJ
+iYmGhoaEhISBgYF/f398fHx5eXn/qUblAAAAN0lEQVR4XgWAoREAEBRA3whs4EzgzgKCARRdkrVf
+RVHVZEm3nAPQCmvwjhjIiVqQxuisydm8+wFiHAiDEYBbTQAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/fav.svg b/mp-wp/wp-admin/images/fav.svg
--- a/mp-wp/wp-admin/images/fav.svg false
+++ b/mp-wp/wp-admin/images/fav.svg 2e185191867593b63d5648f8785d2b976a34ba11a717066f37ac94855a9d0f776f3be2f75e4a1d4019681f497bbcc874b4b8ec61a47d0e97614376f75073ceda
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="3px" height="32px" viewBox="0 0 3 32" enable-background="new 0 0 3 32" xml:space="preserve">  <image id="image0" width="3" height="32" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAMAAAAgCAMAAADgzjIVAAAARVBMVEWRkZFjY2OPj4+NjY2Li4uI
+iIiQkJCEhISBgYF+fn59fX2GhoZ3d3d0dHRycnJvb29tbW1qampoaGhmZmZlZWVkZGR5eXl/uoGc
+AAAATElEQVR4XnXDRwoEMRAAsWrnnO3/P3XvCyMQX5xzKKXQWmOMwVpLzhnvPSEEYoyklHjvUUqh
+1kprjd47YwzmnKy12HtzzuHei4j8/wGXmgMEq6X/pgAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/generic.svg b/mp-wp/wp-admin/images/generic.svg
--- a/mp-wp/wp-admin/images/generic.svg false
+++ b/mp-wp/wp-admin/images/generic.svg 65fe3d8d2ce01377b9d668e14327b3c121550726621874bbae9bd17ce015c6849b03d707555433ad32294c8f8f23fcb3634412759b6021d8188cfdbba27ead40
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/gray-grad.svg b/mp-wp/wp-admin/images/gray-grad.svg
--- a/mp-wp/wp-admin/images/gray-grad.svg false
+++ b/mp-wp/wp-admin/images/gray-grad.svg e5d1d40bc194ddaa9ee72b61beb8f6f8acabe5023ec2364aa7301c5d275329681a41519f79d73af3785a60cc6ac08fcbeb3e04a604eb9c87273a32638d86da82
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="31px" viewBox="0 0 5 31" enable-background="new 0 0 5 31" xml:space="preserve">  <image id="image0" width="5" height="31" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAfCAIAAACgQJBPAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA
+AAsSAAALEgHS3X78AAAAIXRFWHRTb2Z0d2FyZQBNYWNyb21lZGlhIEZpcmV3b3JrcyA0LjDqJid1
+AAAAFnRFWHRDcmVhdGlvbiBUaW1lADEwLzI0LzA4KQ6r+wAAAClJREFUeJxjfPv2LQMSYPn//z8y
+n4kBFaDzqa0eXZ5U9QMtT6l5tFYPADsXLPcJwrwLAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/icons32-vs.svg b/mp-wp/wp-admin/images/icons32-vs.svg
--- a/mp-wp/wp-admin/images/icons32-vs.svg false
+++ b/mp-wp/wp-admin/images/icons32-vs.svg 7316c08035b11d5d6993bfdf508a2ac62aab555b9bb43b4ee31ed4df17546383681210bb6f7034db2c6be1a071db21fe4014ef54d345db42527810f311d1027f
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="650px" height="45px" viewBox="0 0 650 45" enable-background="new 0 0 650 45" xml:space="preserve">  <image id="image0" width="650" height="45" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAooAAAAtCAYAAAAp8krzAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAK8AAACvABQqw0mAAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
+dQAAIABJREFUeJztnXd8FHX+/19TtibZ9N7A0JUiCCIWighi74qciifq2fAsp556Zy/oYcGKp2cX
+sdCUFiB0AoSE0FJJCOltk2yf+vn8/pjdkEDoIbt8f/t8PPaxbXbmMzszn3l93u3DUEoRJEiQIEGC
+BAkSJMjhsP5uQJAgQYIECRIkSJDAJCgUgwQJEiRIkCBBgnRJUCgGCRIkSJAgQYIE6ZKgUAwSJEiQ
+IEGCBAnSJUGhGCRIkCBBggQJEqRLgkIxSJAgQYIECRIkSJfwp/rDfq8veBnA1CO+8Jbb0cruUIBS
+7TU97DVI+2tKSIfvfK/JYd8RgNJ5VR89/vKptrk7mZ1VEANgKqX0RkppMqUUxNteSilIh2fie0+I
+9r7DZ76HqqoghNQQQhYSQubNffD6Zn/vY3ewqbQmZefBxuyqFgd6xVguenjCsGrfdx3OoQUA5pW8
+eNNuf7Wzu1iyq2KIoqhTFUW5UFaUZFlRIMsKJEUplGV53t+vvWS+v9sY5OjMzip4Gd5+jR52jbZf
+q4SAqGqnZ1VVOz0UVYWqKPP+9+gtL/t1h7zMzioYBeAhADcAiPD1VUfbL1VVP3vr1ksf9nOzzyR6
+AOEALAB0AFQAdgA2ACKA49WN47y/vQBAnve38plqbJDuod/rCyIATARwMSjdTynJKf33rdv93a4T
+ZWVBbYyqqncrqjpVVhSLoiiQFcUuyco8WZa/e3DSyDOiG05ZKAKYWr1qfr9ua8kJEHXehVMBvNyT
+2+yK2VkFt5t03OsXpEVHDowPt4QZdbruWG+ry9N7e2n1kGV5xTPv/ejXF79+7NazWlR4ReKO/Y1t
+8RXNNuypbsqtra8f9fqdVx70LjK15MWb+v25t/LhJxftAICzVij+ubsyRlHVR408c/ewXrHRMaEm
+k9lw6LywOtzpmwrKR77y04phkiTPe2P6tQGxr7OzCnoBmI4uBn3EO/jRBjUUqlc4qZRqYoJoz0r7
+M2l/VgiBolIohMxTCPlmwYzJFT27Z6fM1KcmDOqWfu2uD34OlP7qAT3PzR3RNx5RoWEAZUEIOWI5
+VVHgcjpQ1dSG7furHgLwf1Uo6gGkXPfpklkF1Y0Xexx2nWxrk/pY+JxHrhj5QXyIbufEiRPtOLpY
+NBBCBjg80pt1NldKlFlf57A23p2RkdHYg/sAAOj7yi+vMRx/W09uk6rKL6Uv3favntxmNzLxg5tG
+PXPVoJSR5c2O6mX7Kgsy/vXTf8teu/M3fzfseCzfV307B/p637iwyF4xlkgdx7IAICkq2X2wvndO
+adVDs35f++KzN4/vdt1wOkKxx6GEgGEYHaXUbyO32VkFt0eYdG/dMCQtKTrEYOjOdUeGmHSTh/WN
+HpQaF/rhko1vTXvvJ/z45J1npVjMKqy6YXNpzefbyuviC+uskO2tYPWGuBZX1Hb2t/UPv3rL2N99
+y46KM1oA3MQwzIuUUtWPzT4l/vBaEQclRd3fPzEyGgBqbW5U2dzgWAZJFjOiw8yG6y88Lyk1Jvzh
+7zKzGQSAKJ6dVTDFpOPmXJIRFz0kKTLyTGxj6b6DM7/bVjztyk//nLni4WuWn4ltdCfdOQGBLMtg
+GMZAKRW7baUnyeysglF6npt79fB0hIQa4fQAgqAcIRQpIRAEDxrbnKhpsfva7te+9gyhB5A2ac7i
+j85Ljxs/ZmBvvdPuYpqbm7FhzZqx//jP5yn/vPuGFxp+/DF72rRp9i5+z0mKMkCSle++yy7o835m
+rvnNSQOlYenxowEs6eF9AcPxt5W8eFOPGWwqW12Y+NHyqQzDvO7P8/qUofTiqwaljASAc2LCUmaM
+6Z8iShJ6P/sVc2DWfb/2dHNO1EK4bE9VDMvQ10dnJKRaTPpOukPPc2yfpNhohuND/9iUe+c/v168
+5q17u9cjeVbFKFKiAoDZX9ufnVUQY+DZ18+ESOxIjCXUMP2KC5OMPPv6ja/OjT1T2zlTrCk4eMOS
+/P3zfskpjt+e+Qf+MTgM/7gwGe7yvaivq4/7feeBH//92/qbO4cpAABMfmv0KbJ454EYSVamjugV
++3D/xMhohygjt6qZbNtf07pxT2n1qh37Dv62eVdttdUmUgD9UxMtfZLj75o+68sjwzZ6njtvHJqW
+dKZEokophiTFRF51Xu8kUZannYltdDeq2n3jFFmWASCs21Z4ajw0pm88IkKNkCggyxSKLEOWJEii
+2P4QBQE2pxtNdhdsLg8URQH82NeeITSR+NGiOZf0S54QbTYbGqpqmaJNmdK+pfPcoc2lHtbeYHnj
+069ezsvLS2AYpitPUUh9i/2NT7J2Zby3IsecoLQ6EsNDm3787rt9Pb0zPY3NI6Gk0Qaqynr4/7w+
+JShRTS2uQ/qWZRjMuGTQpEfGD52R/uSnt/ZkW5bvq76doWp237iw56cMTht+8wV9+t0+ekC/20YP
+HD4kLfZ5QtTsWb+vvR0AJFm+u3d0WOThIhEAZFXz6hgMekNacsLFDofj3u5u66lbFCnFqw/07L1u
+9rpCQLvY/QIhZOqotNjIMykSVUIhKSoiw0IMlw7uG7lofc40AB+cqe11N6v3HbxhQd7+ect3lRlb
+Ny3EG3+9GWNHDNHEIMvhzaXb4eJ1hgX5B37sFRvbcpgFxwDA6aemnxKSLD96XnL0/WnRFovVJSKn
+osG9v7KmtnD/geyC0rIip9vjToqPTc7eXTTqhWlXXxgfaTGMGtQnesPOvdPMY2+f714//0gfYM8x
+KtFiOqoYeHrRDuytawXHMuBZBhzLYmhSFF6aMrTL5cMmTwfD8mA4DgzL4cDPH6DNI0FQiFkmZGSg
+WahmZxVMB3A5gI5xxQlLdh8EJVpcdHssX3ucMYVKCahKQKgvvphgQHIMLh6Q3mn9XqF4xvqKE4FQ
+Or1PYgREAJIAiIIASRRBvDHgPmRFgVMQ4ZFkcCzra7vf+tozgNeSuGjOpf1SLmc5nb6x8iAqdmyU
+mssKPaOGnrs0Mqx/NsMw9i15u8nOnTsZaPfHjuerzukRBoiSFPv56tyQOKXN8fSUEQWVpQUfLF68
+uOW1117zz571AG5JQY3NDYcogxLCwc/n9alCVcVQb3fBwHMIMfDQ8xxkleD+sYMnUVVB6qPvo+rj
+J864ZfFkLYTDBvafek5ceJcDepbR+meVUIRFREQKsnIHwzDvdad37pSFIgXFfTdM6a52nBCzs/b2
+6PYOhxBy48CECMvxliuot530ugclhIMCWpwXpVBUgr4piRaV0hsZhvnobHDJ/pFfNmdBbulja/OL
+IOZl0vmvPcWkJieB53mEhITgpssvQd/eaXjs20w4wRgqVJK4MLcUY1La/9KzysI9f2vREKOOvXtg
+cnS0Q5SRc6DBvSV/76b8guK81Zu3ZgNoBmDfV1omT750TMPSrbv6PHjN2CRziNkgilJfAEYAbv/u
+xdGpbHXhkTEZnT5bWdIEj6xib20r9ta2wCNIUFQFHAMMHz4S1rAkSITCVpKPFreIeocHLlGBpKiA
+tr8BIxQBXP7UhEEpHT+oaXPxyREhJ72iz1duPZpQ9CtEVUGhZWr4rImqqhzhYlcJBaWAjmMREWJC
+uSzjrg9+bpw2+0dfYg4UVYWiKFqyjqK0qar6Wda7Tz3vlx07Nhy0voRA23U9gLTJcxbNubR/6hUM
+y/ENXpFoLSv0DOid+v2u3Jzle/bsKRMEoTUhIYFarVYJgNJhnboWu2PQgbrmd2d8t2bIW5dnZOv0
+hlZHQ/WH8378Yc+ePXtcftjPHqPVLcEh+v98Pl2oqhTWtDqtFqM+OsQQCgAw6nh4JAUPTDh/ElEV
+JN3/Jmr/+/wZFYuSLN89MDHyhCyEeXsK7hUkyeKLSTwchgE4lgEFICiUdQtiKDRvgKO72ntaFkWl
+i4DoMwnt4e0dDiEk+UQSV1jmNLdDAVElYHhepxKSAG30FrCCAgCW7Nw/5+ftxY9tzN0Needq+u2b
+zzGpyUnQ6/UIDw9HaKh2UQ7X6fDJ9CvxyNfLIBIVz/62ES9dNQJEFvy8ByePKElTR/ZOjQaAkgYb
+KSg/WJtfULRj9eZtqwFUArACEAAQCppV3Wh9FNBuxh5RBLSL2W/H9XjxeBf3jsOaMit4joGOZcGz
+LIYkR2L53iqkRYXgzpEZMPAcAECQFSSGGfDt2h2otjvhiYyFSikEWRvfeIViQFmoutr/U41RVBUV
+sixD16F7CAShqHqFIgHas5u72kcGQJhJD4MuEhTAoPQEhBj04DjuiGUlWUJFvTXi0/mLHgIQaEKR
+BxD94NyFE966dWw+gJqoqKi4yR8tmnNxP00kNlZWojJ3E7UeKFH79079vrRw35+7d+8usdls9QCE
+/fv3H75OXUNL26Diqro5M3/NHvXMxb23hjDyrOWLfinJzs5uyc/PdyOwBkAAgK11boxOPOQw2FLt
+wJiUsC7f/7G3Cn8U1CE+VIdRaTG49rxUbK5sw8VpET3e7jOJs6qsfNXe9KoEiyk6wmyEnuegEgow
+DChhMOPyCyapioL4e15Cw7evnDGxKErSSVkI3W5Pp2UU0vkaplQTmG5JgdvjAQJGKBICxRvPU9ly
+7PakRXVPOIM3RtFvdJUp2BUD4sNPaf0MAIZhQAiFKKsQFNUXMxXQQvGX7cVLf8kpvmprzg5E1e0l
+77z+LJuanAyj0Yjw8HCEhYW130A5jsPwARn49L6r8e/5Wah1tOHlpbkYnh6XUqb9BWcNgiRNTIm2
+hFa1ubC/tslWWFq21SsSSwE0utfPl3zL3vbKJzzPMRygXeQeQQD8LJxUr2BosTsRGRYChun89z8+
+bmCn9x5ZxdI9lbisbwJiQo1ocgrY32TF6N5xMOp4TBraB4nREcjK2Y0HJo9Gawd7jKSdxwFlMe4q
+HvGUhaKqwu12Izz80LUfCEJRUVVIAGSi3UhklUBRj+zHJJWgxeGBICtQVQIdz8Gg48Gx7BH/iSgr
+qLPaIcsSE2DhBDyAuId/WD1TNoQ89tm6XQX3jRn44RXv/3bnpQPTL2dYlm+srETNzmw4ayuYtPPH
+yDsbWvUVe/YU22y2BgACPfIE0FU3WgftLq+c888/do56ZERCNic4Xn33g/f2bdy40Q7N6ki6+J3f
+kTxudAwzlTwudAwt7Ph+e2UzvrhtFOx2O97dVIaxaeGQxbNv8H48qCqL87P3ui/uk0QlhTIpURZw
+LAuWYQAwUAmDv15+4SRFlhF7x7No+nnWGRGLJ2shtNna2peVCKAonU83SaGQFApZpXB7BECzqncb
+p+56plqjAMAlKsdc1rfc6RIAFsWe2Q6lUAgFofAFlXfrQe9OvtywJ3vxzv2jc7dlI7qhiHw7+1XW
+oNfDaDQiIiICYWFh4Hm+XYTodDqEh4djeP8MfH5/KB7672JU21uQe5Cab/zgt+UMw4yklPr3QJ8g
+giBZ9DzHWp0S6pqsrtKKqlxolsROIhEA3IIwcWT/3iEAUNtsk10eTyv8LIx9HgGrzY7Nuwpw5ejz
+wXEc2K77L+yubkZapBkxoUbsqm7BW5k70eL0wMTzOC8uBC9cOxrJURaEWixYvDkXY4YfimWUuxAn
+PcnsrIJxAAYD6FjftP/G0voICi0ekRIKtyjzVS0OUG9dV+otDUQpaX+dFBWGAcmdc8wUVYEoyeg4
+0JeVY/eLPYGqKBAACDIgyCpEhUBRuhCK3u/q25ywuQQUlZZ0dDN3cj+rigJZlp0eW8uv0BLQAkUo
+ht3/1Z+PMCbz47eNHqBfkL1n0FM/r31jzDnpcQScvrmyCtV5m6irroK546abYEsZYmnaknO1bcas
+8rb/PPhOVyKxvKZh0I7i8jmvrS4YNX1ARHaI6nn1k48+3Ldx40YbADkQBaKPwwcqhw8QuhowNDU1
+AZSiqqoKCndGctz8Rq9nvhxiTuw15tHxg4ftraxjqKrlA6RER4BnWfjGyQoB7pk4ZpIsy4i66XG0
+LPiw28WiIHROGD+ehdDW1tZ+rxAVdLqGKbRBvCCrkBXiM0J0673lNFzPxGclQFr0sS2GUjdlEvrb
+oqj6Qah6rR4BaWmbu2539u87Skbv3roBMdb95Nv33mCNBgPMZjMsFgtCQ0MxfPYyMIxmTmcA7Hzm
+OvA8D4vFglSGwdy/3YgHPv0dNW3NyKd0+M0fLdrKMMzos0Eset3HIATweARVkuV6ANbDReJVz7w7
+xaDn7x07bGB4WZMLucXlHqfLsx/HL+p7RlG9N4o2uxPfL18Hp8uFK0efj9CwsC7FYv7BRky/eBBa
+3RI+W7UNA1NSEWUJhSpLaGuqx/u/rcJzd05BamIClqzKwnl9e4NQDpTSbusDToPBT00YFN3xg51V
+zYbzU2M6hZLY3CITbj52nH5mfgkGJB0mFBW1veakj4CwKCoK3BTwyICgaF4KRel8LERFRZtHglNU
+wRpMCOP1GDp4MBhKqiml9PBi3E1VFau/fva+/wFo889eHRXjn2s23fbRE9M5m1tkh/dJM9vcsSl2
+UWVbq6tRnbtJslYUqenDL5Zn3H2HJa+wDBgzMnltwYGH8Px3MoD3OqxLV3ywZtCmPcVz3ttcPurW
+dGN2jE59de5HH58VIhEALu+f2On9xAFJx3zfDqWw2WyYOObcM9W0HqfXP/47hBIy9eO7Ln/46iHn
+mJfm7ENhdZ020QUFkqLCwXXwqFAwmD75skmqrCDimgfR9ufcbhWLvnsHcGIWQofb5RRkhbA6nlUp
+oFJtwEuhCX6HqMAhyPAIInEd7qfuBk7dokgoZKWHO39/WxS7dFUduVxBwykks3jd1R0msQEOWRQD
+ig3F1SmbSmuyV+6tSCnakoWLYlh11hvvc4QQhISEICIiAmazGRzHIdTA4/kJmgvz3XXFADT3uk8s
+chyHn568E89+twzZNc3Ioxh58Rs/Vb40f82YV26/vNKf+3k8PIKAVpeAVpsdZpMp+YpLLnrhslEj
+eAA/+JaZ/PTbUyRJvvPdh+5NojoDe7ClDUuzNljb7I6N0ALt/YbsvZ50Og52lxv/+WMzbA4Xbr9i
+LExm8xFi0e7ywKDjsLmiEVXVtShyMbC7RYQQAYk6FVxjFbhpV0FlGDhcHtjbHCDGCBACyH4Wil3G
+I5IuPsPx1buqEsiKDJ4/1H0qiqoVJSeBJxRdkmZRdMsq3LICtUO/7ZYUCArBZRlxyIgJbY859ZJy
++Pr2N9vx+Up6GYBnoFkSu/2mdBq4/nbJwDdeevv95+6demu6Yggx2iSVtTkcsFYfJK3V5Y4B6Sm/
+bK+otVz55nfjVjx/d3JSsggA6ZSQmb2f+xoH3r73PQC6PWUHB2Xl7p0zN7d21JXxNDs1lHv1q8/O
+DpGYVVKHXTUtx11Oq2bAQsexKG44pPkrrA5strXBHlmL9MgQDEw4tVCqQKHX018MoZRM/fgvEx++
+dlgfCwBMPr8/HK6dKK+thaLIkGQZSVERoAAYMOA4zbBx95Rxk0RJQtik6ZWOzG+2dVebvO5hACdm
+IbS1tG4qqKjpfW7fdAvDaPdQ6p34wCUpaHYKsLpEVNVUO22N9fvQzUaI03A9E0hei0ROed0xlx15
+jjaycXvdGwDtIIi8Lh1KAV8Zig5T4YUY9YgK07IQA9GiSLo4HqeSzOJbDwEFAQX1Piv+t8R0Yn1x
+dcr6oqrsZXsOpJRtWokx8QZ11rN/5yilCA0NRXh4OMzmkPYgeIvxUBheuEnfQVgz4DgeISGhoBSY
+dffV+Od3S8nmqga2hqjJqyjdIn+//OI375py8MhWBAYMw9TklNWc0ysmnL988MX8wabWQe/OX/HE
+jS9+kCvKcpgkyRONev7e2X+fnpTRO8W884AVSzdstlZU12Y73e7d0BJd/IbP9aSoBFX1zbjnykvw
++qKNUAjFHZPGwmjqLBZFSTOUpkSEQFFVOJvq0XTwAA4cLEMRA0SatO5Ex7EQRBGCKELVayEU/nY9
+dx2P2EWbKD1uF6sSFaIogeMOdZ+yokClQMfdDIRBnqwocImAKFK4RQUeSYHqbZdCKCSV4JZhaYgN
+NR53XTU2Nw5YnVC0P9MWQLGJPpwje8WucI3oF/bZ3C+fuOq6qxNoaLTJ7RHQ1tLs6dO7d2FcCL/D
+veqXnH2hyRXXf7rsL4sfvir9LyP7AEA6JcrMvs99yc+/d8LKZVt3zvlhn3XUpRZPdv/omFe//eKz
+s0IkAsCumhY8OXEoWFMYuNhUcHFpYIzHzuSPGDAcuHc8PDLBmq25WHiwCIYS4OepF57VQjH96blD
+QMjUj++a+PC15/dpL6+h0+lwzchz8f2ardhXXgm3R4DV5kR8VARMBr1XMGrVAIb0yxhEVflCAN0n
+FAXBfjIWwsrmqkXz1+Vc9WxaYqiO07MMw4BQCpeoicRamwvNdhfJ25FjtZbu7nYjxOm5nr0ZjcdL
+m/ctZ/NIuPLctJPazE8bdyHUaPRuMhBvNkcu1zf2uBV0jrqedgHtfd2dBYBPl8y9FTdsKKn56I/8
+spTqTUtx84g+6pP33cUBQFhYGMIs4TAajWBYtt0FF3GYUCSH/WEMy8IcEgIwDN6efg37zoIsdcnu
+Sq5WkZMzJWmL+mPmzFnTJv2OAOPLNXlDTEajPTk8hO2XFAMKwCoSVpKkISkxkSvMRj075ry+IRNH
+DA6negO784AVq7fl2ef/sTzL7nQtB9AIP1tjfFY+VSWoqq/HhGEDQQjw0q9ZUAnB7ZPGwtBBLFJV
+gUeS0S/Wgt6RITiwdiOcTVYAgNFkwLn9+wIAHC4BiiRqU/xR77R+fj6PuxzkeTvmjpywRVFWOscj
+qioUQjvFGgWCRVGWZc3tLCsQFEVLkFN8megEE/olnJBItHkk1NrcaHaKHYtxn7zr5MxCXC5X0+gB
+vX+jhODn3xf9/aIJlyewYVFmPjzWlLcnZ+j5qbET7rrrri2ffPLurJ2655XrPibTlzx6TbtYZEjh
+31/8Ze2DZXYl6Xy+LXtYUuKrP34196wRiZQCQ5Ki8N7qXe2fcSwDjtEshzqOgZ7jvK+1B8+ymJ+r
+ZXp7ZIJJo4fj/Mv6YdD5FyAlwtzJwxVoe5/xrx+fBqVTKSEsKDFrscZkNQhZQynZTwmZ+sndVzx8
+7fl9D7spM3AqFOf3z8Cy7Hxs2luI1JgoWhcRwUSEWWAyGaHX66ESCkZvSqEUvbuz3W6PsLqgoqbf
+iVoIdy77viDqnIFfzlu5+bG7poxPUFUVNo+EZqeAGpsbjQ4BW7dtbazYm7feVrprF7T5yruN03A9
+E7i8fvZmx7Hvd77l7J6T7zitDieSxIj2bfqTw0WbVnKi+9ZPocUqyCqFqlJQgvbRv7/5NafkhqW7
+y3/aWFJtatm0BA9cM1aefsNVOoZhEBYWhpCwcBjaReKh34WbDgnFCKMeXXj7wLAcTOYQUDB48vrx
+XAi/Xv5xy15dbROTNK8w/3upuRbvPz49YMTi55k5QzyCMPWakQPHD0qNZwEgv7oF+aUHkZEYxz9w
+9aVpkZZQqAD2NzhR09aGP9ZttM7/c8Uat0fYrqhqEbQai35VEj4rH6WALKsAw+PaS0dBbzDgtQXr
+QQhw26SxMBg1sTgoJR7r9pZhyvAB+NdfrsGBokKoghsMy2LIwL749tUnsbm8Edt370WSmQPL6aCq
+8LqeA+vaBeD1Whz2mTeB5djrIkfEI6qK4p37+tBngWJR9MiAqBAICoGoEKheN5ekqjg38fjlTxRC
+YBNkuCQFPMcEdDHuW2+9Vf31118bLxqU8RvDssy3y1fOHDxiVJKqKCbR7TIsWZE/8Zpxo7/jOK6q
+6pMnZ9G/vYPr5qjTl8y83icWE5dtz6ehYlXZRf3iXp3/zZdnjUgEtMHPuL4JGNc34aR+t7G0uv11
+ksWIEbF6XNQvoX2dBF5PXwD9BRkv/vjoxRnxMz+fNi6ZYQCTjmcBYH1xVVJeee2dokr3n5sc3e/a
+8/taJIVCz2uuPkqBBrsL9XYPmj0KEpMSkX+g2v3rnyvLx48YoktOSAhPSExKsEREwmAwYue+ghzV
+1lzSnW13e4R589fl3H4yFsJFb//jPy0PPh9T39x6+zVjx8RKlNM1uwTUNLXIK9etb8rdsGZz05al
+vwNoQDdXSTktoeiRtPuczX1sD5pvOafn5EVum8Pd/nu/u54PF4oUR1jITmv9hMItK3BLCiQlMCwx
+Pj5bm//T/rJyky13NUYMHWKffsNVFo7jEGqxwGQOg05vAAXT6UYJaEJx08FWsGBgMeqP+P4QDAxG
+E8whIbhx1CBdXvF+e15unkWxt5i+Ldz+fU8LxSXe+ZsVRblQVpRkWVEgywokRanxCIJ9yvn9xg9K
+jbcAQH5NC7bsKyV5+XtoWlISl13ehMhwEY2tNnlXSZlnyep11uq6uq0ut2eNSkgBtMxop3v9fL/2
+uocnmFAADK/HrZPGAwyL1xeuA1EV3DJ5AowmM4b3ScVXy9bh3JQ4pMVF4Zf3X4KeY2DSad1ITmUz
+dpRWomjXTtx28RAYQ0PhkNE+UvYnXQ24urrxEW+1gWOhqCpUelg8ojcovmN/EBBCUZYhKYCsEO2h
+kvYkJnKC4l2rwECh51jEhBgha8W4Nx2jGLddVdV5We8+9d7x1979+MTiZUP6/+50eyy/rt74RKRR
+xzaWFbqumnDZ91xcrxF3vPHfpzhO99/37p0yi/vbLO66Dxbct+TvNyV6xSKzejsJm73t4GVVGzdu
+wVkiEgEc99w9GpQSOBRv3U1KNCNIh3Vp5/apr/9MQKk69cPbLkky6/lOwdRj+6eG9o0Nx6aSmsFD
+U+MYAO0iUSVAo92F2jYXqlsdqLd7kFdRZ9+0ZesasTR31/L9+RIfEWeBKTQGnE5m9EZRbamrkSsL
+C7uz7Z///S+7b/znf07WQihvmPvmS80Nf21dvGbD1SrYSEmWIXpcdmdtxc7WvLXLod1bmtDNRojT
+cj23B4Mf5xryLXcqblRFUTpsx+9WiZo2l9A7IsSoI9BOOl/ln9NJS6bQblCiosIlKd5p09H2AAAg
+AElEQVQAcxUtdqcsi4K1G5p+2vQPIf/bu2fjXyf2TXhyixTyLM/zlvDwcOhM3hqJDNtlJ/LKlPM7
+vT9mR8Ow4Hg9DEYT8srrm8ZmxL+8Zn3xmxPGXvJL9+7N0flzd2WMoqqPGnnm7mG9YqNjQk0ms0Er
+Atlsd2F7SeU5KdGp7LnpiaxbIthd04KtBaWO+YuWVLY0N5sYhuV/WZ4pqRREkqU2QZQq3B4hV5Ll
+YgA10C7kFvf6+X4fAXSVYMIwDPRGE26dNBYV9Y144ZNvMHn0cDAMi1CzGRf07YX/zF+BEQPOwYhB
+fSESwKznUd/qwLLNO5C7IweDU+Iw9LzBkMxhaGrRvA2Hl3/oaboacJEuLIqaeDzeuoh27XfojjQr
+Y+fzO1CEIqh3Xw9zqp9of8wAiDQboOO0+/H7M67vF2bgvbXnOkMBFNW1kPtnfQF0ziLuUW699VZ1
+3bp1DbdMGPN9dVVV7Oo1a+64fsIl31Uf2L96wNDxz6Wc0/fSqsqDFz3y1Z//GxYi/fT55qK7Js2a
+RzOfncp4xWK8LMv3yfe94ar78vnZ/tqPk+XoA/FjMyItDm8s3gJQCsZaidCM8zqtixAKQgJMKKqq
+JB1lhxMjwzA8PcZQ1+akPMfKSZFhOlml7SKxptWBepsLOcXl9gULFmWKlYWbpaqS7QCscmUhAyAc
+Wv1iCq1WZlN3t/9ELYQz3p47LmPoyLd0ekOiLMtwO9pYa10N39pQzwtuJ6uSqFCm/zkJpmtvusIY
+HqWA5aplQn4E8GV3tfU0LIpqezD4kZE+hy3rXe6UhaJvO/62Sqjqwu1lNUPGDcmIVhRAkpVDlhJv
+p8n6SsF4y8H4RGBX8VA+fCLRIyuwCzLsoubmyS0osnusDZvh5zIqAPD5o1OfAvDmgmxYEu7+1zO+
+GokSeFCGaS/efLpQABzPg/I8Wfzjl0sB/PH7j2U8fvimW9Z/LP7wWhEHJUXd3z8xMhoAam1uVNnc
+4FgGZZW1SI+N4M9NT0STU8be2hbkFJbaFyxdkVVV35jfYm0pA8t6GJYjYBgKLTpBghbL1QjN3ewM
+BJEItM+Wop263nMWAFiWhdFowhUXDscX8xfD7XZBbzTBZDbj4sH90T85DovXb8U/12yCW5AgKTIY
+oqKXxYiplwzD0MGDEROfgHqXAp71jeT9e+0qinLETU5VCQ4v8arFVR77XFZUbZrNjsup6pGiMBC8
+AbIsQ5ElKJKoTefXoT7kibaPAmh1i7ALMhRC0OqWYNSxMHQxa4tHUVHV6gqIYtzjxo1TcnNza6+7
+dOS7fWNC5+Xm5jJ79uypHXpP5IjImBhueHJE2M9ZW2esrG26qZkYYq178g5eM4uY/nx2WrxXLKZR
+NfuxhHtfofVfv+Q30XsynKqQm3JeL1ySFoXq6iqgz3lITk49wqLoi5sPFCgh8x78dlXvBY9dn66V
+yz4EwzDoHRcFuaaRsTrcOlmlCs9xfE2bC9UtdtTb3MgpLrcvXLgwUzywZ5OwP38LgApofTUDTSTq
+oE0SoKKbY/68HNdCeO9rH199+bjLrr9w6DkxsqLXqao2u5IkCnC7XFAU7fLieR3MISFgOR7VdQ3p
+q3bs6XfdK3NTlrz04Mvd0dDTcj37Ov/jxvR4lzuVEbasyIe243+hOG95XsnMtNjI0MjQEIOkqu1z
+pKrezpfnWBh5DgaeA8NolhRB9rqSfVkqHc9o728FWROKbkkTi1UNTeL6rTmtTXuyM+HnMipeCLSL
+xcEZzCQ8PBysTgdBULu191AJBaEMAIYCcEFL+DB12waOwuKdB2IUVZ06snfcw2nRFotDlFHSaCOV
+ja02a5vNJcuyWlXfmPzm9Ov5Rp9ILCghS5avLKqub9zSandmMzxfDTACGIYF2scJKrTsZg8A2d/u
+5o74XM8cx4FhOXhkBaJbBOMSwDIMVIYFw7BwiDJkhxvEoGVOMgYTrhl/CcaNHAqnwwFZ1rKhdTo9
+QsPCYA4Ng13WSq/oOBY8x/p9pKMJxcMsat551TtyIq5nVVU160qH7qgrN24gxBfLkvRNaeG+6Qnx
+8VBlGYosQ5QVrZTPCbaPel3qTU4BzU4B85dnlRy7GLfkdrc2r0IAFOMeMWKEfMEFF9QCsN47+9ub
+zp0W8W+GYWBtbJSmXtpfP+Keq0Ie+uQXU299S82Ic8L/9lP+romT35BvW/nC9DRfggvWbpgZd9eL
+aPz+9YAXix3P5/wmAcNiDyUq5dU70djahtwqzUkVFRaChy7q0/59kYvB8IGD2t9vq2nDBUnh7etV
+D4vL9TcV79z3ReqjH/T+PGvn/fePPz+aYdB+XWoJIhzS4mNQeLAeZXY3rxBGFlSiq29zI6eo3L5w
+8YJMoXzvJrGsXSS2Ukp9F8WZEIYAgNXF9TMA3LmqqC5ZkiTY29rY2qpKvrG+mnc6XayiqKHsyPMS
+Qu+dflNEdFy4y2HjKyrrkJKc7g0NoOB1elgiDgsTphSCxwOZQjdiUP8kt8dz/9gnZ9Wsf+/Z/55u
+m09rCj+fS/h4545vOcWbGXgyKIoaMK7nz+6/tvmu/3z36pcrt75yyyXDkyyhZoPire4ueq0zZj2P
+SLMBPMuCUsAlKWhzi3CKmvXRZ2nsiG8mFslbELeyvkn8+pffqxpLdv/orj1QhTN40p4ECgA7ACej
+0xOdTgeFYbrdFUF8Wd/aXVj2btPVvVs5EkmWHz0vOfr+tGiLxeoSkVPR4N5fWVNbuP9AdkFpWZHT
+7XGf1y/jkR1ldefYFZbdVVqGooJ9VHS7w1pstmwApWBYq3v9fP+rgxNEUtTtpY22VBWcCQwDlyhD
+JiKoUQDHMhAUArAsXKICN6N93gmdGcYoMzrmzCoA2kQVClHgFGU0OwWUW9vc8DiLe3LfDkfxJpt0
++kzVah92RPWW6DoWKvHGcHWQv115SwKhYoEky5/l5+2YPnLkKBj1OngECYKkDb65kxh/UqoN4gRF
+hSRJWPrqww9Ds5Z3uTgCqBg3pZQ88f2qNxRFmTFkxCizJSSEC5HayMKd5SQixMhOueRCdsEqIXqv
+y3ZD3c//ek6+7Wn35Fe/vGflv2e0Z0OT1VkzY+54Fs0/zwposdjxHBfcLqjkUPF4j9uNHZXNmHXd
+CNjtdsz8Yw/a2mIRZrG0f6+SQ2V0REFsX59KqNf9HDhCEQDEugMfv/GzJ6lXVMRNY/qnhrZfkl7P
+HqUMEmMi0VBehQNNNl4krFRYWSssXPR7pnBg7yaxbFdXIvGMsbq4/uUEi/H+PrFhsUae0wEAISkQ
+hD5wuVztlRJ0Oh1CQkJgMBpRaXVi9c5CHKxrw9D+fY5qmKOUavVdvV6cpKSU2Px9BdMYhvnqdCew
+OE3Xs9bgyQOPqMvaeVnvcqqiQFJOVigq7b/3t0URAH74xz0/3fDih4avnK5nL+h/TmR6QpwFLKcT
+VQIDx8Kk46HnOOh5HTyiBLtHRotbgt0jQSEEXAcXX0copWhzOOWdBUX2DdtyWhuKd/3ckL18CTR3
+ZSAIRQqvdYCCoQzDeAOej348F2Rtxme/L0Njqw28ToeocAuenHo9plw0/Ki/8dWR9A4KfPEhZ/QC
+nr+1aIhRx949MDk62iHKyDnQ4N6Sv3dTfkFx3urNW7OhHQN7hCUML33x4wMcw/TNSIrlUxNiudLy
+g6GgpPosE4kGANGTB6ZumZ9XOv4cExtDVcXQ6hEhihwUvQCeZeCRVIBh4PDIkBURiv7Eyz5SaK7t
+DWWVrYt2F1tRXZIFzSrtF2RZxuFGP1WlR35Gj1/JQPXGNnY89btyrfvb3Q4AS156cPv4J96auWHD
++jkZGX1gCglrv+kbuRPvi6mvtittL/tzEEcvj+PrKwKiGPfj3658T1GUGROvvTosnScYHsUCSGA/
+zWokVU0tqtkcwl0wYrh59dq108Y89uqaLR/9++28mx+nk176fHrmK387JBZXZs6MvuVJWH97L2DF
+YkcdJx1WwklR1XYd1dTUBEoIqqqrMcBrRVS8CVkdl++YhkCoHy/go9C0YE5t/F+e//HpH5aNmTvj
+htTe8VEGnmXBc9p9lmUYsCyPxOgoNNvdTGnpQWbX3n014oG9G8WyXdnoWZE4I8FivP+8xIhOU+Kw
+LAuz2Qyz2XzEb0RVC8UaPqAvVm3LgyR4MLhfRpfrp9DCYgRZhSAr8KjQiaKUCK1CwWnV7D0t1/PJ
+JoIpiuItuH3iqAEmFCmlKsMw3w0Yd3V2xZBR00wRMeNZXhdFCPG6pAgWvP5oPwaAXaBwyTJcogxB
+UTD/zxUHaxoaRUK0OAPflFi+94ootHqa63a07N26VmiuPQCgFlphW7+bJjoe6+SH/qN9hmNbk//9
+xY+48dprMWrwufh6TR4Gxhjxwa/LcOXoowvF9jqSJxjW0B2IkjR1ZO/UaAAoabCRgvKDtfkFRTtW
+b962GlryiRWAsDk3v2TEoP75GYmx86ZcOCTBoVCs37FHAhjhLBKJRgDnLN20423S0DyxpbrO9Nve
+MhCXHUt3FdXvapVcjNmimnQcOyCEiQQQPT9vX92OBoebmi2q6g058cXy+SxwxDsP8hGxuI1VW5G/
+bhVK8/JxdAvUGUdRlCO8GVqm8uEWxeO717qa872rzwLBoggA6z54/rPBtzxY0lxX/QijN40nlIaq
+ioLRo0ef9LoYpl0o2iil3R7g393M/GbFe7Isz5h8w7Vh6Xrg/HAtIWdFQTXMJiNb2dCqllfXS9Fx
+8fr+AwaZc3dsuw/A782/fzgrV3kEE1/4ZPrqNx5pF4tYtmxm5I2PoXXhRwEnFik6D9wv7BXb6f3o
+3vFYX9bQ/j4uzAibra19mdG9449Y3vfeVyEg0JK/KaV03LhxWa3hkz9+7KtFL7xz9zWxA5JjQagm
+FgnDAAxg0OuRGh+LUKNRV3zgYCwf34tH2a4K9JBI9Lb1zj4xYbFHfI6ukxAItBrUskIgKCrS09Kw
+ZuMW9EpNBdPFFKu+dTkFBY12D2wuEaJWmtAI/wnFQ53gysLqYyx5yOJ4Kq7nTqPywJn+Vy5at7S0
+aN3S9wF8B8ACTbUzE599/0sTtDuiKKtwi1oG847d+6wle/LXFS744gfv1139EdT7nR2aFSvgZj+Y
+nVVw+w1jhid9un4fZFmGIEqwGHQYkBSD89I61+4yGAyIi4kFx7JgWRbRUZEwGY9f3Bfo2UGBIEkT
+U6ItoVVtLuyvbbIVlpZt9YrEUgCNHeduvv7596X42GgyrF9vHGh1QwUl3pjEs4WYb5ZmfdToVia0
+wYR9igWNsgFqmxX8ng1f7/32260AWocOHWqOve2e2wHcm3Qw96u6uXNzALSewvYUaG7IJvhxJhrN
+oni465kcETqh43lXU5s9BPANgjqG12ivq+qb6N6yg0pISIj2CaVYtHaz8suylU3gDSrxDqJVu3Xr
+Gd2pE4RSqjAMkwVgJ4AYaP2VbsyFC38EkHoi62AZBhzLIkTHQwqAQuInwqP/W/aeLMszptx0vVck
+ap+vLKxFo82DVUW1SDLzXGFRoVveu0cUXc58j6PtFwAcAKFl8SezctUHcPlzH05f8/bjXrF4VTr5
+Y8nMiGsfQtsfnwWUWPQN3LdVNKK4sWtjb0njoYiA0sY2kForKg0V0HuLb+t5tv01z7KICzMhJSKk
+89SyAca6detMOyrqKu/5dlXEY18txPwn70JEiMkrFgEKBgadDuGhIWAYFhMvHGHeuqfoIgAf95RI
+BABJVpKNOq7T3PKy14PR1f9KqTZzkqwSuEQFHsKioaUFTQ4XdPqjz0dvEzQPpkeSfULx1EMMvZyW
+RfFkOZURdsffnKabvdvw1tSSGIZpgRY/Z4DWuTC+TEIVgOAtd9Pc5pC35u9urdqa+Ts0l40dXVvx
+fckPIgAxECyJHXl39d6XU2PD7r9syIUhZt4EQghURUFtQwOyiytQXl2Ha0YPbZ/Jw2gwgGUY6FgW
+LMfCoONhMp1gXkoPHmtBkCx6nmOtTgl1TVZXaUVVLjRLYieRCAAqJePGnj/IFBcZjl01bbJbEFpw
+etWRepqIZVtyJ9Ck/iiqr0NjaTHsRflItpgbeJ6vBlACwDpy5MjQqJjYZjAMEhMT66CJ5uZT2F7H
+89lvVldZlo+0HqrqERUbQkyGNpOed8iyrFNVtcsBgI4hSlyIri3MYmo/SSVHq9WxZcn/oF3bPgIl
+bASUUtnbX7mhDWpZAuaELLyMN97LrOPAhWp1FEc88O9Nw2a8CFVV2x+K95moql1V1Xk1i+f6TUg9
+/OWf78myPOPqW27sJBIzi2rRaHNhZXENksw8GpuaVZetdc/Ob955Apq7vAUA7xXXQtufX8zKVf6K
+Cc/Mnp71zlNesXhdOl20cKblqhmwL/syoMQiABQ32vD0FUO6nMIvYsBw4P7L4ZEJtufswIodq8Fa
+Fh76McuCMYaCj0sD32sw5t85GikRx57+z88YAfR7YWvlR2xouM5RWYmHP/wW/5p2HQamJ4GCAQMG
+rHdeawIGCfHxZrDsEGj37B7DNwWqDwmAJB/dM0uhFbsXVBUuSYZTkuH0iGhss8McevTZ3+weEU6P
+CLcg+YTiad+fTiuZ5WQ5FaFIOv4mwAJpvULOjQ5V0C97YhYAQBS1rE9RUbFq0+aG+tK9C521FWUA
+6gE4z5YCrj5mZe5+sk9y5IOjz01NcLkBh83ldZ2r4HkdBvZOQ25BMRZu2IYbLh0FjuNgMpnAsQz0
+PIsxfeOwr64ZrpAjLO9d0pODAo935iBCAI9HUCVZrgdgPVwkXvXMu1MMev7escMGhpc1uZBbXO5x
+ujz7EQDli04CueRgTVldmTVDarXCXVkCpa0Jcf171dtstkoADZTSVgDC5wuWuxiWQ2RkpAOA9Wxw
+NR4N+Sjlcbq8ChmWcLxO5ji+yw6W5XglNDTMabGEt3dOlDdYoVnsWjosKgJwnHbjuwmvUHf63t/3
+6YIT6pAPr6OYOfu5Y9ZRLKhpJhMefA7wUx3Fv32x5CZZlmdce9vNR4jEhjYXVhTVIMnEw+WRsG9v
+vru1quxPAHXQ/pv2mGhKKWUYRrCt+N+sHepdGP/UO9PXzn7GKxZvTMeC32aGTZ4Ox8pvAkos9o8L
+x39W7W5/z3lFko5jsaaoCoA2Vd+Ei0Zh2LhBGDx8FDi2ay0RHXJiHiA/oQOQ9sCy3e/W1TcnOyoP
+wpW3CvsURXnSbnN8+Og9Ib0TY/WANjOUpKjwSDI8kuLziBrRg3G0gth5zCgrmlfjWBCqxVLLKoGi
+Eng8AhxuEUR39DG3S1QgyCpEmXSb9b9bXM8nyqmUx+noeg4Ui+Kx8FkUHW4BbW4JxQcqnUV7d20v
+XzHvN2gWBvfZJhIBQBTFqaP7JcW5PYDL4YEiy1AUzZ3nc1PExMZjbfZmTBk1BGZzCExGIziWgY5j
+sa28DqWVNXAWbIP40HXQ6fXtlscu6UHXs0fQPKIxoUYY9DpdfEx0Ig5zk05++u0pkiTf+e5D9yZR
+nYE92NKGpVkbrG12R7dPwH6GaUkJM6x37N6tP1BampqRklAVn9q3bli/1P+uW7euU4a9Sa9vrw96
+ttPVvMvkKP0JwzCU47ijH1OGkQ1Gk2g0mdqXIQzrBlBHKT0Vq6tfONG5qE+ljqKiKH6royiK4n1j
+Jow1ZxiAgaEUTolgS3nDESJx65Z1DmdTXWbFmt+XAmijlB4h6n1i0bHq+1k71Dsx9u9vTl//wfNe
+sXhLOvl1/szQiXfBufr7gBGLF/aKw4W94rr8rrT+0DgmPsyEQVE6DE+N6ammdSccgPhXNhY/s7Wk
+arytrBQt635FmLOh8dEH7nvnv5sKYx+Y/d/bZj14Z0K/1GQToYeqk0iq6tMvPToNpaeDUKTAEUX7
+u0IlgEIAxTsVqkcU4fJIgP7YzgDOe2/trvnmT10onoJoOyWLYqcYxcDXV6qiQIUWJ9Bkd5I/1mTV
+t1UUZ0GL0bIHmjv5RHF7PJZyB8farC0QBU0o+hBlBU5BRl2bG612B9wulyYUTSawDAOeY2GtrkBb
+diZiWBFtba2IiIiE4Rjxij2ppT2iWFjdak8PM4cZJgwbGL1jb+Gkq8Zd0njjix/kibIcJknyRKOe
+v3f236cnZfROMe88YMXSDZutFdW12U63ezf8GHt3CrTNvPHylyvOz/ihqakpoaGhga2urrauWbOm
+5pxzzmnKzMyMBpABICosxBRNuygkfTbSVYcZFRZ6IHP7rt6U0g7B+poriBLtfccgfu2cpJjz82Jx
+9tc/1YLXyx3iEQt6fq9Oj67+E7WLhAXFO7d1s0tAk0PAS+99UtLR5ax2TMxTVaiq4lacdr/VURQl
+6dJByXFchpmiTVCQV9l0hEjcsinL4WysXV32x9fvQpsb96iWJZ9YdGb9NCtPvQ1jZ742ff2cf6Xf
+OSIDwO3p5OefZoaMvWOFa/3PgX8OdJiqL4Bi/k8WBkD4T3uqbl6ys+xO2/4StKydj/MTwnLueOjJ
+2cuWLdvXuG6tlb3gqqIHX3//5sen3Xrx5NHDIwXvfaqpxaZQWWpFD4cMeTyHbhMyALlDWb2jcSjh
+TrsmPYIIpyCB6I8e0UIIgUHPg+eYbpsdqkctijERYXjrh4XtWb4dM34JIaC+DEpv50spRe/kxEPb
+PAtObEVVIVLAKcrYmJNnbSwvzqzPydoIzSUVEPFKp4Lb7bYXVjYR0e1kFVny3kg1c7ggyWhzeNDY
+YocqS1B8NSXNZjAMA55lkJDWB7dceC52FZdBEASoxzt/etL17BHm/Zm9a+Rt4y9OSoqJNPxj2g3j
+M7flDalttMpGPc+NOa9vyMQRg8Op3sDuPGDF6m159vl/LM+yO13Loc24EhBlQE4QefLkyTXQrNu+
+2Fr1ueeeY5555pmULfvK3licvXtiaXWdKcubDa0oSo/G8pwJuhJF5/ftle90OgobGxrC3S6Xd9Ry
+/F2VmutsztzMFehc39MGPxeXPllkSVqwaV/5w5ece44F0OKhXKKWHd5RKiregHptGQpZUVA+/8OA
+raMoiSJ4RcX+VgmNrXY02t3YXN6AZDMPp1vCpg2rHc6m2tUH/vz2HQBVAFqOFz/bLhbX/zJrB1Fx
+6SMvT9/4ycvpNwxOg1A32rK7qPgWAK/2yA6eBsNSY/Hygk3am6ZKWHqf698GnRrm3Q22kV9sLvhH
+c3GhyblpoXDlkIyV6cmJ386dO7dk9+7dDQBc2PDbL8ZzxxS/9+U392zcuefqB2+5LrGitl6Z9+fy
+eqW1fnNPN9rVQSi6RcDmESHKx74PKkSrLMGxLFiGgSBJcHkEEP7YtglCKViG7TaDS7cIxePVUfSR
+kRSPjKT4U93k2WFRVFU4XTL2lVe616zNyq1Zv+QXaNZE19nocvbhdLnmFe3bk9IrPT0BACRZK9qr
+qhRtDg9sLgHNNfvRN9YCSRLgcjlhMpm8FfIZsAwLg8GIUEs4CCEQBKHLk1hVVTAM06MWxTmP3DF/
+6uufjU6LjfnruRm9LPFRkYYHbpiSFGn0Tj8HYH+DEzVtbfhj3Ubr/D9XrHF7hO2KqhZBE1xnlUDw
+Fl/1oLPATflmadYHXWVDOxyO086a8zdHc8EYjSY5Lj7eJsuys8sFusIU2gIt6aejq1JGh1jlswFJ
+lud9/Me6W9JiIwypcVGGVrekzcJzmD+M0M7TPSoBXkdRlKSNG/eWTu4fH8E5XW7kVTUjUs/C5hKw
+YV2mw9VUt7pi2XfvQEtYazpR97hPLLo3/j4rV1Vx8YP/mn79uDGW1z/8bL7a1rj8zO7V8XFIgEM4
+9q6MyUjCkLgw1NVUA0n9YYlJOO5vfPBcQIShGABk/HPx1nfLcrYlY/eapiuHZCxotTat+WHtmoMN
+DQ1t0LpsDoAi7NuSD+DAdllsy9m9dxKVRKfSXJMjFmxegB4u1+XyaJeDXQbqWh2weWsrHwvftccw
+AM8ysNvt0tYNq6sor1dlWYasKFrpL+/DZ+VvLynotq/rjrb3aDLL/w+oqgqHIOGXFVlNjpoDaxXB
+VQetzM1Z7cP73yM3v3f1ix9FW63N0xMSEhPB6RlZIaCgsLZYUVVejGjVgbHDR8DpdEFVSacMZ0an
+g9kSjqh4FZIoorWlpcsYRYZhIElSjw8KbHbnvA9+XmIaPrDPtZeOGBYdFmYx+IL3G1tt8q6SMs+S
+1eus1XV1W11uzxqVkAJoNxpnIE3Ldxp0mQ2dEm6ub2lpkXF2JewcwdGEIs/zJDQ07KQs/YTTuaAl
+99iPu3AAs+SlB3ePe/yN12Z+8vO/7r/6sriUxIRQmYLtqoSZ5oYHdCzrc2cFbB1FURS/ylyZeVnj
+sKEmkymE01GK2oZGNWfbFreruW515fIfTlok+vCJRc+WRbN2tNStz83LuUmtKc1S6sr9+l84FKDR
+5oLzREQfb0Bcula0WQVg8xxfL6mUwqjjwR8rrvzMwwFInvbZwnd2rt882FK968CoQb2+3bd3b35p
+aWmVw+FowaFBO4ND8zS3urYsfgfA1wBivZ/VoocHdi63Gw4FqGi0odHhgaioJ9Sp+kJgeI6FJHga
+in/54QmcuMXehm4QxKdTHmfe/R98PxXemB74CnBTormIKdVK6PhiXnzLHfb60Gda5X909d63zW5S
+x2cSRVHmzcvc+GhRwZ7lDdsyV0OzOJ1NMWxHZdkbM/89fPoz+3cQvCCrJFWSREiSDNHjVmTB7QHD
+OVYVVikMr9NuNYRg0YpV3uNMsG6Jdjw/88VcdDz+6Pi654/1um07dgAoa2qxHlizLXcKITRRlmVI
+sgJJltoEUapwe4RcSZaLAdRAu9G0uNfPPytjTrugy2zo2P69Gmpra604w7PjnGlkWd5z9TNvDe4U
+W9fVo4tC+J3CY7R4xGMXjj2LWD/nxZ/OvfGvB/9VUT6NNZpHEgpz+7zNR/lvRHvLOn+3+1hkvvX4
+ggvu+6dpdWbd/ZTlhyuyDI/DVuioKc9s3Jb5JzR380mLRB8+sSgVbdsKoAialWlalkkAAALKSURB
+VOto1tUzjosAxTUtcEpn9hIlhLZPD+cnop/4/Of7Vy1bM7m33JSTEm+Zt27t2rK6uro6RVHsOJRU
+yBz28E0/64EWKgRoIrFHLYpOt2feo7O/miqIIkRRgiCKECQJoihBlCSIkgxRliDJCmRZhiwrkFWF
+URWFIYQyAEBcts3QSpVZT3CzErpBEDOn4+JjGCYcQDqA8NNtyAliA3CQUuq3i/J49LvzyRhZcP+1
+acfaTa6qkmoA9ZRSv81I0d0wWnFpI4AEAL2hHXufq0mEdmJ2h7m5x4+1eeztPLT9SQQQByAU2qiU
+QNsvG7SOphmaJfH/ikgEgNhrHnr27cLde65oz4aOifJlQ+fs27evlFJ6VrlWD4dhGDO0gtNHzpV1
+crgBNJ/t/4cPhmF0ACLRoRj3cX4S8P1wh32Kh7ZPgBYq0AAtJvG0w0UYbS5WHlofofgjUbHvK7+8
+xjDsVKrKekpIj8QSy9baVZWfPfN0T2f4/5RTeu0zr7/zfT/aslxqadhSUFBQ1dra2gCtrJFP+Mk4
+VOJI9j5UaPre727QbtBMfrn2Tlco6qB1uj2VZi5BKy8T0DFh3htSKLST96yOTTwaPXDs/XKszWNv
+9wlh374xOFQIXYA2KpX/j7ibO6LLzMxMqKio6NMxG7qwsLCmqKioGmdxxr4PhmF4aMf0dGMuFQDS
+2R5O0hHvf2OEtxg3jp0Rerb0wzoc2idAa7fn/9JxAwCGYQwAwqBZNnsCEYCDUtqjyZkXvvDFHwNs
+RatLcrMrd+3a5fR4PC5vW0QcMlT4HpL3oUATiQHRX3fDfdMv195pCcUgQYL838FrLTagQzY0vJ3u
+2S4SgwQJEiTIqREUikGCBAkSJEiQIEG6xK8pTEGCBAkSJEiQIEECl6BQDBIkSJAgQYIECdIlQaEY
+JEiQIEGCBAkSpEuCQjFIkCBBggQJEiRIl/w/xBZudWXEyqMAAAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/icons32.svg b/mp-wp/wp-admin/images/icons32.svg
--- a/mp-wp/wp-admin/images/icons32.svg false
+++ b/mp-wp/wp-admin/images/icons32.svg b4938f0262a04c309e1e1f2cf0aa78c8e1fa89049655f44e6a7779a681d711f52d70630005aae782ae5ff1ff7b2838d19b121fbed03d47ba095647d1b476cf1a
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="649px" height="45px" viewBox="0 0 649 45" enable-background="new 0 0 649 45" xml:space="preserve">  <image id="image0" width="649" height="45" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/list-vs.svg b/mp-wp/wp-admin/images/list-vs.svg
--- a/mp-wp/wp-admin/images/list-vs.svg false
+++ b/mp-wp/wp-admin/images/list-vs.svg b1f26a2a5f3fdd5ef0eee8b5af330ccd6ab739f19169dd4842ac15cf5ccd768ab1d10593a5ee0e1597f371468a19c1b2cf99715d33605a71bb3dcec096995bec
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px" height="20px" viewBox="0 0 80 20" enable-background="new 0 0 80 20" xml:space="preserve">  <image id="image0" width="80" height="20" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAFAAAAAUCAYAAAAa2LrXAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAALEgAACxIB0t1+/AAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMi8wMy8wOFmG0QsAAAAhdEVYdFNv
+ZnR3YXJlAE1hY3JvbWVkaWEgRmlyZXdvcmtzIDQuMOomJ3UAAAPSSURBVHic3ZjfaxxVFMc/996J
+bHB1AxYfClWijT+IEJeQlgpLBCsm+lDwIYLVGtr0pSDY4oNQqEsD5rH+AY1UHwSrRfSlRexDKahR
+awgUNFXBHyFhCdKlxGR/zMz1YTKT2dnZvTvuRIJfuMzsnTmfe87Ze+7evWit+b814B3gGqA321tA
+BpBp88Te4kfTQlkTpCDt2BcB0uTdW3wJAQFPCBFco01KiRCChWp1z2Ams4yUAuCbtbWHCrncr0rK
+j+/cvm2nyWNg+tKiTkkD05cW0+YNQ2IeoJeWlnSpVNLlclmXSiW9srKin92161baPCuNmbIT5TgO
+2WyWXC6HbdvYto2lVOo8maLP2yK/xJLKdV201gghvGAtC0spnTavaQbe+PMvAIb33Md7128awUcL
+T7R9bmKY7KMB/764AMCDjw7x4blzLe0+m53l7t5eAMrlMtlsNljTwmrHAHj55MmmvjCvKYHrNSe4
+NwXXibplRAOuVdaD+7jgAA6fOsWhY8fo6+vj+OnTVCoVMplMbAJbMdopzGtKYOHh+xMD2+nKj8uJ
+3h97fHfDZykbV5mBoQNGxszMDP39/QAUi8WA47ewbs5dNfLeODHVkmcBON5eB4BPF/4A4MWhB5g8
+f8UIvzA1BnibI19h3lq1bmSE5W7a+gQpJY5dBUAIyfz1ywDkC+O8Pv5CLMNxXSZHR3Ech1dfOcxd
+PQoldRB0mFfd+Nvo08Sh53j+YIFKtcbgyNMNPC+BW1XLWtXedAJmj44Z4Y7rXUM5i+V1qihPCIFT
+88pWSEV13QvYqW/w7uefxDJc16VWq1GreV9ej6VQ2CilWvLaydWaHgFYktw9vQ08C8B2t6KfyHtT
+te7oWFgniuN1qui4Ukrs6laQTx4oeO9t3GnLUUBvT+ARbt0OZmAcr3PpBp4FUHfd4PH5r24BMPXU
+I+TPXDDi5s9ONvWFeSZGnH1YUkrqla2A5659CcD+0YM8s/sxo39Xl39qYEV5JkbYPs63phL25Tjw
+/duTRgdb2foyMeLsw5JSBiXXYFdb54vffjD7F7IN1sBQn4kRN3aY1/QjcmTfANG+pArbfvDtz4ls
+/fF9KaWCRR8gPzLsjRHq61RCiCbe/Hc3EjH88X1e0zbGD/jIvgH2n33fCJw781oiB5Iquu3wA86P
+DDO+17ylufzL1w2sKK9b39r+F97u5HSidgGHk9Mpa9sTGC2hbtUtLxpwuISSyj+iSpX3r63/I6ku
+TlCi8tfANHk7PoFpllzcDOyWJ3b6ifTg7JtYSk2ET4j9a/S+XQNwtb64urqaKu8fhPB3IhEofEIA
+AAAASUVORK5CYII=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/list.svg b/mp-wp/wp-admin/images/list.svg
--- a/mp-wp/wp-admin/images/list.svg false
+++ b/mp-wp/wp-admin/images/list.svg 2cb983a88480b3bdb398ba77bc8e003b5a583e3c81718758698fe942d289b47cc230b119de9c549a45abaa6eb2f6105aacf869116d39718db0cdbf690fc97829
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px" height="20px" viewBox="0 0 80 20" enable-background="new 0 0 80 20" xml:space="preserve">  <image id="image0" width="80" height="20" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAFAAAAAUCAYAAAAa2LrXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAA/JJREFUeNrMWEtLJDEQzoztWxFU9qZeFDyI+BwfCHvx5k38Ac646+wu
+qKCwggPeFFxQRGEZ2FUPgn9A8ORlbzIqetCjBz0uDgji+7GbL5gmne6eaZMIFtRUdzr1TeVLpZLu
+0Pz8/EdCyA+qEaIuKarfqf6hagxvY2PDKJ7p+BjewsJC+vT09J+OwB84dDKM4rW2tpJIJJK+uLjQ
+woM/cOilUTzEZ9H78vv7e3J4eMioxZ+EQiHbBpGSkhL0L3/xd+D5iR8+2ktLS228p6en8oeHB7K9
+vc36Pz8/vzq+pqYmhsPxHh8fGR6EY70mvpaWFhvPws/t7S05Pj7OGIQYvNze2NjoaAPe0dGR8vrA
+gGU8upyz+vkNur6+3nGPCd7a2lKOr6Ghwb5mBFqWxVgVSeEBiW383m/WuOTk5ATODj9/ecDRaFQ5
+PviLgozWEdHfJhBLzivDxCXd3NxMDg4OPK0owNMhEP5ywOvr654ZJsYXi8XI6uqqy05MTDh8sIR1
+RPS3+IyjIAaR9vZ2TysTEA6HjRI4PDzsu0zFtng87rIyYbR+aREo+lteAesK8ORlqEMgAtaJUSYM
+hOvgieXBJnB/f18ZUM5e4PX09BibEAS8srLiqH9e2YcSJGY+f4alLMvg4GDGjSfbxuRawvRcozxA
++Q+8si/bxpMNf2RkRDk+7OKigGQ5A18TnzhJdgbu7u5mnF1co97t7e2RtrY21h/33GZagiZKQjKZ
+zBrf6OgoWV5eZmQvLS2xe9ihoaE3i8/OwM7OzkAOHR0dzPL+Xn7A4wdVFent7XXc5+XluXZSPxkf
+H2eW94e9vr529MnNzSV4a1IVMRbLb8npiOlzIAjEoFUlPz/fRaCOiP42galUKvDOI9cNnpVvRSAI
+WFxcVI5vbGzs7Qns6up6txkIAqempoy8OXACdOJzEYhdZWdnx3MnEttQ79DPy8q7lE5ZkA/hWMJz
+c3NZ4wPJs7OzLjs5OenaRHQ2EtHXJrC7uzuQM+8nW5mAvr4+YxmNGZ+eng7Ul/cTLc6HMgEzMzNG
+YgsjuLOzMzZoVYU/T2vTeGVlZezoxLNGReEPHBy/YFHvdfDgDxw2GdXV1enNzc0KnS8UGCxwTk5O
+iEk8XPf396cTiUTF5eWlMh6+Lw4MDKTX1taM41m0QMdqa2t/0QF/uLu7Y59+cHKHhYIIvEuipmFg
+qEco6lB+Tdv/0lr0GeCFhYXRurq63xyPK7BgZTwRhyvwaCZ+Al5VVdVXeiD+eXNzU4nzHPTq6srG
+w4cCjofs4Bg0DlJcXEyKiopwfU6ffwNeTU1NnO7KSYpRCRwoMDFmP7yCggKGA7wXPafPvgDvvwAD
+ACN+Yx904Ae4AAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/loading-publish.svg b/mp-wp/wp-admin/images/loading-publish.svg
--- a/mp-wp/wp-admin/images/loading-publish.svg false
+++ b/mp-wp/wp-admin/images/loading-publish.svg 0e9deacc9db2b4aac0d2c1c1e101d48d0b2a8c79405667d06573e9f1f7276628d36d78cb40c71ad2c0d088d9b7a7b37bb50f066abe02b914d4558ba0a2c454e5
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16 16 16 16 16 16 16 16 16 16 16 16px" height="16 16 16 16 16 16 16 16 16 16 16 16px" viewBox="0 0 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" enable-background="new 0 0 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" xml:space="preserve">  <image id="image0" width="16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" height="16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+YwSRlycNcWskCkApIyEAOwAAAAAAAAAAAA==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/loading.svg b/mp-wp/wp-admin/images/loading.svg
--- a/mp-wp/wp-admin/images/loading.svg false
+++ b/mp-wp/wp-admin/images/loading.svg 6e85a48bc2baac5bb31c02fa767a5fca1ae25fe3d581db5f057863e1a95f2b7bd827fb00826a4b19f02a53e6b3b9576718323725b457a9657328516bad2c5e7a
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16 16 16 16 16 16 16 16 16 16 16 16px" height="16 16 16 16 16 16 16 16 16 16 16 16px" viewBox="0 0 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" enable-background="new 0 0 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16 16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" xml:space="preserve">  <image id="image0" width="16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" height="16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16
+16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+ISADghsLBDEhIwRfGyMWGA8NXBEAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/logo-ghost.svg b/mp-wp/wp-admin/images/logo-ghost.svg
--- a/mp-wp/wp-admin/images/logo-ghost.svg false
+++ b/mp-wp/wp-admin/images/logo-ghost.svg 7675d0b9d482f8ab90379547e57d9b2164e6359d741c7cbfc592e7a605473d99e9583f5f517e837fb79d8116a3017ef837fce65c0ebcf74bcb74a5f54848b6cf
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25px" height="25px" viewBox="0 0 25 25" enable-background="new 0 0 25 25" xml:space="preserve">  <image id="image0" width="25" height="25" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAAEtQTFRFqampqqqqTExMWVlZX19fkJCQeHh4lpaWo6OjioqKZWVlfn5+
+hISEnZ2dpKSkUlJSa2trkZGRl5eXcXFxcnJyi4uLU1NTbGxsRkZGMCYWYgAAABl0Uk5T////////
+////////////////////////AAE0CrcAAAFVSURBVHjaVJKLksMgCEV5+DZGkzTt/f8vXcym2y0z
+DoNHuSgQPqbOySei28uxU/Oe18V9k7Ce5TqvoW36IbLvanvZ+/oSBBpvInGBbnQZpwBN4yYGBjGz
+LUMURVO5SIh40Z9x60BZxYgkFb9tKfnNe58oTJEcjDwyrKqNeNbkiSLwdJqMxKKLaZmIud10BiRj
+LwSSkIBjlgU8TMnDEWogbchU0Ke4u9xmXEcmt8HzeaWjPh1lNHbOk/NTVuwc711QmQ4lmkQsJ5lq
+Z37UA8r0tFhCJSQdV6mRe9qBFtHItA/CEmQl7jhiIXpieVgy2+oE1xCYA/qxMFU4rZTk5ee/+WAP
+bPYldnW6xkWSm0RJJZKi/D7J8Qtn/u3CWFXOBZaMaUEtWKLcPR3Wj6clo6tIyRPcc1DWrPfsyFhP
++TchEtZYh3MhJ+++p8ru2YRs9ejv+EeAAQDDxx8rGrkZTQAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/logo-login.svg b/mp-wp/wp-admin/images/logo-login.svg
--- a/mp-wp/wp-admin/images/logo-login.svg false
+++ b/mp-wp/wp-admin/images/logo-login.svg 4a023d9d343df7069c009460131be98f172f6cbe881bbf2e5aefea8a6fd8b148d2c51e62b20221b8b8951952fe489517250ae2c903690c8f21f3210ab3eb3b7a
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="310px" height="70px" viewBox="0 0 310 70" enable-background="new 0 0 310 70" xml:space="preserve">  <image id="image0" width="310" height="70" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhNgFGAPeJAEZGRiF1m/r6+vz8/Pv7+3R0dPn5+f39/Z+fn3Nzc11dXe7u7lFRUYqKiqGh
+oczMzFJSUqKiomlpaePj49fX139/f1iYtLa2to23ytDQ0GhoaJaWlpWVla2trcTZ4ri4uMHBwVxc
+XM3NzaCgoImJidDg50uPro+5zKqqqtnZ2S59oevx8/Hx8fLy8qurq9vb26jH1jyGp2aguX5+fuTk
+5Obm5re3t464y6nJ14Kxxu/v73SowD2HqLXQ3OXl5VeWsy99oe3y9d/q75zB0nOnvy5+oViXtMPY
+4UqOrc7OzmdnZ4Gvxdra2t7o7cPDw8TExPDw8Jq/0HKnvqrK2IuLi9Tk69Li6c/Pz2WfuavK2J3C
+0oCAgKysrHV1dS9+oeLt8fD198Xa49jY2JeXl7jT34CvxNPj66jI1t/p7tHh6I23y2WeuIGwxsbb
+5e7z9cXa5DyFp+Dr8FiWs8PY4j2Gp1mYtMLCwo64zD2Fp1iXs7fS3oCvxWafupvA0IGwxZvA0e/0
+9o65zMPZ4tPj6sbb5O3z9XOnvsXb5O709vn5+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAIkALAAAAAA2AUYA
+AAj/ABMJHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNinPCgo8cHCzSKHEmypMmTKFNqnHCBhAYA
+MGPKBJCAw4WQKnPq3Mmzp8+KEziEkCmhQISjSCMUUCBTAwqcP6NKnUq1qsMHCWIW6JDhwIEBBMKK
+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
+MSqaMk9JM71AnMR60Su2gsRK/MRQHMUDERAAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/logo.svg b/mp-wp/wp-admin/images/logo.svg
--- a/mp-wp/wp-admin/images/logo.svg false
+++ b/mp-wp/wp-admin/images/logo.svg b661940f08e5cfa0485ed358aaded13297045594e732fdda71c7bc0d91e7722e3a9c63925d292e53a5b489b8c1e39abd14082a610ee82949385f23b040ed30b3
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="65px" height="66px" viewBox="0 0 65 66" enable-background="new 0 0 65 66" xml:space="preserve">  <image id="image0" width="65" height="66" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhQQBCAMQAAEZGRszMzGZmZqKiov///4CAgOjo6Lm5uVJSUpmZmdzc3HR0dPPz88XFxV1d
+XYyMjK6urv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAUU
+ABEALAAAAABBAEIAAAX/YCSOZGmSyjEUS+sWw6EQZ23feMQcBQL8wGAQUTgYcsikKFAAEgeBGWE6
+VQRWDmChQVN6SYcswJGQUs/oKkTsOHS/yMDit+Cmq4Hofcr8OQJwOAwJdAFoBgcPc0I/Ag8QZlMG
+iw8MgScKAgAIdpIQmoyhfgMGZwFZDgqXYD4FDFQGD6KzQgWGUwyyAAerEQc/EFS5tMRCD6VTBz4J
+b16/CLcEDT7F1T8IwVU+D81Iz1LD1uI/rtoAD86b4KDj4wLICj68SPEA6+3tDjFU9YCCWW4IMGCH
+rxq3NA02WbpB6ODAguIK7CFASKKNAGNeEWgC0RqyPZoa2NB0C0JHaw4m/1bJeOKXxCksXCxIMGAA
+ISALaq6Q+UInR5wqp8gacCLLR5XsogUlgHHIUgYIECwc8evgngANBuhqFEPpGQYBVBD8EQnNrQEA
+IJSYUxbNWEYBD9GymuaggTFv7i6oohGNSVov07wNcvTMgoBN/EUgFPBB3DN3ifU981fU3jstpiRE
+J0LTKwYALgsm9hgWsU6GASBDkDKC3mQ/Ck+pLEoASFopR2eTpSrhAKHA7kSmJZsA7VClCdCBrRbt
+LTG27wwOkk0ureimf6xENwdXkLbGieUeTfxMQrJTANh2kLvpD2Zphs8Cf5xRdYpAAnYPPTvIeLfE
+wGfdLHSx8xsB+12GVv8QXvWH222ziCYffM4BcOCCQNCVHS0NhhchFRjyR0CFFwqBAITz3aEALaKJ
+sdyIAGBUohCogfjgHi4y8tKKQSgYo4VThEiOirQImMZNoRyI5IsVviTkD5NRkaMQM3TIYyh2TEnh
+j5fVt8sdS/o3hVR3TAnEK1cCcWATULUXimhnpBkEMwklhx8j0YX5JYIA8CmJKMWZaQ8BsmAXZyjZ
+mHmLevjdQo0Q91GhZ27UBMpIKXJqR8BdEv2SzU9BGMoPI3QCEekUYebJyGWeugbAS7+EAt6UM2z1
+36jUjWkfcKpEkMVnohgpqVNQfVemsecJsdqJIjAGUyi3rpQhAbECISz/qkDkthUQ0W3WxYqXuSdE
+hy5yASpeaVwJ36P5ASfSCJogI6iG2G4iEJbHAsBFstl61xpV52gWyonp/sBNtUHQeydwQgSEFlEl
+GDXFIjQea+7AURKw4kvsoguVVCZUJW0tYJ4Imih2tiENI2dZWEMWLTOSsQIHzxLYGQmUsi0A8N0F
+8gkJYUdxu+luREvGGrEr9C43NAHfQ6HucfIspwrsBDJo7XVDsQHVQ9gdCIciKhVbISAFRggcgcOK
+Zptj6h3nhlIcNW1r7MO7OXxTBTvRTk3LgeZdcw/ESRBSNwM/lRW2KNHKsoBGD3HmhSx1G7cMGnGL
+EglogCuQheRfGB6XhgEF/Od3gJCZEcA2vcSaQF8BfLT4LASnsSDhq9TzB9ziVL73Jnj3ogNHBRSm
+wAALCLpJTl7FQsdUwo9wisHgaZxHHtU7P0bw0ZcQRiMQFDcRIosgMAD03bdEsQAJHNAhUwckwI4A
+86SPhAEQDH1NCx2rN0Cv9oPDFRLQAjEgoAUPgAL6LhECADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/marker.svg b/mp-wp/wp-admin/images/marker.svg
--- a/mp-wp/wp-admin/images/marker.svg false
+++ b/mp-wp/wp-admin/images/marker.svg d1adb508c46e0d01aee16f57c371fa8711845d657c715675321745966c455441cc8ac8709cd3e4954d1843e26d202b4f3fb6e3350bd67da25c5df811ee6d5bcc
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="17px" height="17px" viewBox="0 0 17 17" enable-background="new 0 0 17 17" xml:space="preserve">  <image id="image0" width="17" height="17" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAK3RFWHRDcmVhdGlvbiBUaW1lAHZy
+IDE0IGp1bCAyMDA2IDEzOjMxOjIzICswMTAwHvJDZwAAAAd0SU1FB9YHDgsgJYiZ4bUAAAAJcEhZ
+cwAALiIAAC4iAari3ZIAAAAEZ0FNQQAAsY8L/GEFAAAB5ElEQVR42q2Tz0sqURTH72Qq4mASSAoS
+IfSDdCEI8qJFLXSjLYSQNoGLINrI8/0ZD9q0KnDlKkIMebmP9xZRCEEiLQLBiMiNJDYq/Zg573vp
+CkM6CdGBD3Pn3OvXe77nDGPfENKwJBHx/CxYAtNAAVfgXJKk7khVCCyCP6ALVKAJXkEdbINxw5tg
+M4HHPphSFEUql8usXq8zWZZZKBRiPp+PH3sBx2Br4FbiBg+aplGxWKRgMPiMH1+YTKZDq9V64na7
+G+l0mprNJo7RG/g94IEoQSsUCuRyue6QToIJYAJWMA/Bo2QySZ1Ohws9gZBeZI570Gq1yO/395BK
+GJg+ZbFYznK5HAmf9vQiKW5iqVQim832Fyn5E+83Y7EYieAdY2Nig7dRqtVqrNfr3YiWGsVltVrt
+r2f0IrwEZrfbGeqWhQ9GMeFwOPprRS9SAWo4HGZOp/MH1l4DAS6+HolE+u9Xek9kcK+qKqVSKUL/
+s0hPDhFY83g8j5VKhcQg7nxs80/w0mg0KB6Pa2az+RTpDbDA3sd/lwvk8/l+Z7iS/FHEAor8H9rt
+NmWzWYpGo+T1eikQCFAmkyFxAy7AJ255aMHYcIID8d1oNBi8hGuwwkYFDq0CPlG3YsTb4B/4BRwj
+Bb4S/wGzT16tu5THiAAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/mask.svg b/mp-wp/wp-admin/images/mask.svg
--- a/mp-wp/wp-admin/images/mask.svg false
+++ b/mp-wp/wp-admin/images/mask.svg fdfac238ffdb778d9c799de6672d984dfd8d2373eb4da3cbb091eb3a67b4c499fa99fa39e56ab8f24f33104bff757e937430a8e5a6ef5a91f65e8ed74ae45a85
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="101px" height="101px" viewBox="0 0 101 101" enable-background="new 0 0 101 101" xml:space="preserve">  <image id="image0" width="101" height="101" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAGUAAABlCAYAAABUfC3PAAAAB3RJTUUH1gcOCDMLN+YTsQAAB5hJ
+REFUeNrtXdtS5DoMbKkG/v+Lj/cJCgbb6pbkZDjFVFHLxjepWzc7mQD8fV7uY3/6/ClxUg77vxBq
+LzTXHePtxfpfDkR33yv7XEbIXQKdaLt63vF0vRVHOwjwrv1K0jrHXLFGu5K7PnZw/QyIY9Juh2SR
+5rUGYKvCsXNW1u7qc8m1x4FEnwHgJGgnyT2i110C2mHln8MTo+fL6HMn+K8CQtRmTxVXZACzsZJM
+qgVllbVkfwRzKOCOjUyDnNeKxkeNV0i5QqCr16iMt8CAVkZhC6+zXaJXNkV20e8meE0XAawcLPnO
+yvA4sE+worcxfTtCY8YT7AC5ppCCjgUKSnauWQHZDhhfmRQjhGXAVIFXCcq0zWQcmz4qUZbpk9k8
+mhC6WoRMzJuZ3xa/o3HNFCmVo/yTwL3C3Cfl/PavNVl8l6KWCD2/+d9p21dPWe1Y0bXYi4zNGMpJ
+mbekMEcNDFFXgxj1NaLYsESkOEbWipTnY4cRKFglS0m6Rs7xdcMWXYvasvqk5ngEhKi7WiYEsJZb
+UXAmjwfXTnhD6pqyeRwFgLqtSSUm8kqFSCOKEqsYWXT2xZbLqidABHpVJXqShKzx7PqrxkmREuUJ
+VhglpLEbOYWsCCCfkDrLJx6QXwHeMuHLgqPpAe0GmSq8JUOBJyy5IiMKvy/nYcOXEWdZVmjLtLNk
+7ios35A6854MWer/w0SffQhBATirSAYYhgQjiah6/nKOzOYxKont4mu2yAV3yQTRsIwlJQt+VBic
+IIQpCjy4ZqIX0vkho5cavlZAg7TijGKZtsp4Fyz8hEF9klJ9Jjg6H1NJtAZSPADIC+SpZElErY5Z
+mMoJDcn4CkAypLByZjwjlP8RVE2DKAKYHIIDhPhTxZRNrFVSukIvneh3lqAcXURKQCAOTR7kB8Ev
+kXziwQlmU4hGq0Qxd1R/vq5jDWtJD04McrPInGupIa0KGLNOBtQjhD8IcFQvQhJwNMzR8eNJ8p8J
+WhHmk3EpTzHSE6rAYqPAKqH7BBRfKHyalIohfOrw2JTDzD5DCWNV0rCI4UqIYaz3FHH0fA/BIwB+
+lw4hjrN7oGjX3WnJfogQZ/B4TLxk9Rh/dCOJ9azo9iube3wXAhYgzOJ+1SM6vcyjkpgpgS1RVVUS
+OBO6VuRWwMuQlyb8QZSrI7npO1U9uVCOejI0McQ6kbTVOeXN4whOjpWbXOz9+53wECq0CkGzkOei
+9btC9CNRGTH33tXi4ORxiCfDkieveSEnUaQwXwg1wlOUe+1OHvHsknZHjGf+j4VXeYXYSCEnYy6r
+gCfBU6xxpwsa54vkczKETXPKY8NsViArAOUNYcQDME7o2REmP/cpb4sJvlo2kmA5WdmolY4TyTmq
+eCr5pMtApwXKjpTTCRAiMI78fsKJE2EWUE+W0yzZFCkoWsauxMyUlpkStusYxQtyA8Ixy5sIrrKY
+B9WSQz+f6iYSjZEAwpq+I+WdqBTQbBWO2jlRdfzqrKxr71KS6cNTKqea3cfdK4NwoX/3Ka8367fL
+Z9PwhSZQO4+7M0fvSBDWCXZW3hF5CqNodFSSBQHE+iiQdtdtZTB3Ht8ueOLjlNIZUnARKVb1lOx9
+afv7absP9PluGIaUqApTLRPEMXsnEHcQwDwXsH3u622SCLEhpbRgcXwHCVUjU7+Ooeaw8ZxTIFYR
+aHiwQX3CEIm+uMDLup7SnCb6TgXQDACjZDdRmeeinZQXK1LekyGg42sJp772gBuNCcHt6Mj4Pz0F
+m8NICMKh4OJVUpD0mm6PRHHt8XGTqwokkmOZUIKCQWTGYnFQquKALJarkhgE2CiEEzSFIlSUPxAm
+O0jZHrNAUCirMIiKqnvtjF5ekAObR3RnL0/4kei7Xpcxq0YYUiDKUCUuY+mefEKU9aLl0T2IMIYm
+N0bB/SEAXvH+jjZ2vWn4QtKaVCWxKRM71gRRWKjzKg8n+uYZuF3bD09BwZI7x1aB73zTEIr6qbJN
+S+LsQgD/Tq2Ol6Qp45AIfx2GFnnM0lPeEwIpArAvaasAgaIOyhgmBJaurcKXnVxUaLtCHpYIu0jG
+oeQUFACsEpBp6zQSRW4g90rdo6TgwFzd8172ivREn5AUFBbqBkYNQezYjAwn9R+zRJ+ZGA0gd1lq
+57wVg8wawNRTugHtAoPNIR3EP3/PcwgGUcUCz/sUkEp3kYIDxtBNvhoxqrJ9C18ZpRlLi8buXH7V
+fyQUH2KYVoGPchD9NwS+ekrGarqsr9uKM+2jGBa7xnx6SpdiHe27hJn5ixW76536KDLsjGBKCkRX
+XQHHgMiu29Hvt/z+I3xdBUTX+JUB7Lxr92eumLf9gQyBI6n/t7OvaCDjitgkWKWNIQWFsWzbHWuM
+Z1Ii5aMKZtdXGYsCAVWgVePceeLIzD8jpcN6hiD4B2HPIScLWAdpp8Ywfab7FHaynWVnBe5U9oQe
+FZnZa2OW6NUYPogck1EKLzIHG1LbZF55SkWo3zzmFeTbekpl4ivaT43dATyuwOXr5rEifFTasvPv
+wt5oIPnufkzfEZES5Q9mwUGWoSDWYOWoAnfnOCp8XSnQyfmsYey4QN+x2qe84sduMIY7PsMA/Ie/
+z0t9/gHKOXPlZc81WwAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-image.svg b/mp-wp/wp-admin/images/media-button-image.svg
--- a/mp-wp/wp-admin/images/media-button-image.svg false
+++ b/mp-wp/wp-admin/images/media-button-image.svg 3f97e34e7bb4c4e1f569009366f19a313e09fb65663030e43c7482b884dfac2a27a17fea35f5bb0896dc5abb62887f88c9973631ab903c8e27e553f7ec88424c
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="14px" height="12px" viewBox="0 0 14 12" enable-background="new 0 0 14 12" xml:space="preserve">  <image id="image0" width="14" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhDgAMAIAAAP///5mZmSH5BAAAAAAALAAAAAAOAAwAAAIcjI8Jy73mIoAz0WvD09Xu7VWg
+InYkJTFoamZIAQA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-music.svg b/mp-wp/wp-admin/images/media-button-music.svg
--- a/mp-wp/wp-admin/images/media-button-music.svg false
+++ b/mp-wp/wp-admin/images/media-button-music.svg 3c812c2543a44e952612e87aa64bf506397f1e1104145a7b09a8c5d58ec9290af8a0eba6f121e054661bae73b72427f4a2f31a1daaa729094575a24242e782fb
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" enable-background="new 0 0 12 12" xml:space="preserve">  <image id="image0" width="12" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhDAAMAMQQANrh56mrrLe7vsLHysvQ1OTt85+foObv9czR1cHFybi8v52entPa37CytLS3
+uZmZmf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEA
+ABAALAAAAAAMAAwAAAU5ICRCB4AMSmA8I/S88NvG8UzL4xMICQEUrFxLFCQOXTMRw7FwPJbNYCM2
+hYmqjwa2oWQ6GNDvERICADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-other.svg b/mp-wp/wp-admin/images/media-button-other.svg
--- a/mp-wp/wp-admin/images/media-button-other.svg false
+++ b/mp-wp/wp-admin/images/media-button-other.svg a798206802cbecfbe7bc07a5a0dddbf329a38a05230d8eecddde20dfced85f0e07c70bc0e584b8539e3d39d8c2a690dd7021f4c3c9a56a6ec75c328cbe131e76
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="12px" viewBox="0 0 13 12" enable-background="new 0 0 13 12" xml:space="preserve">  <image id="image0" width="13" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhDQAMALMKALK1t+Do7tHX3Le7vsLGyqOkpdbd4uXu9Nvi6J6fn////5mZmQAAAAAAAAAA
+AAAAACH5BAEAAAoALAAAAAANAAwAAAQ6UEkZQJjYjEMWOYOBHUuSlOeBIcXiugUiCedrl4KC1Hci
+6zybT0G7CXO6li02QjlVEw3HAxJhKJZrBAA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/media-button-video.svg b/mp-wp/wp-admin/images/media-button-video.svg
--- a/mp-wp/wp-admin/images/media-button-video.svg false
+++ b/mp-wp/wp-admin/images/media-button-video.svg 2c9fa86b0c60099d0c114b7e436ca4a48f56835396af70bf5a7255d958e2c2f30bcff04bd02b210bdf2bea058b157c505949518cfe47a7ad4180d3fc4a7d6112
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="13px" height="12px" viewBox="0 0 13 12" enable-background="new 0 0 13 12" xml:space="preserve">  <image id="image0" width="13" height="12" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhDQAMAIAAAP///5mZmSH5BAAAAAAALAAAAAANAAwAAAIbjI8Iy2D7GgxTVkdtjHLnniXi
+SG7QiaHhVB4FADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-arrows.svg b/mp-wp/wp-admin/images/menu-arrows.svg
--- a/mp-wp/wp-admin/images/menu-arrows.svg false
+++ b/mp-wp/wp-admin/images/menu-arrows.svg 47ba465fab1555b7acfe7c73426b53fb85ed639d314ed6dfb5754d9f9c215d0aa7469604f0060b60a267ae0a3e39b1df441b4954592921d21a49234c91ef3198
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="200px" height="50px" viewBox="0 0 200 50" enable-background="new 0 0 200 50" xml:space="preserve">  <image id="image0" width="200" height="50" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhyAAyALMAAJmZmfHx8ebm5tfX18TExLm5ufb29tzc3KWlpb6+vv///wAAAAAAAAAAAAAA
+AAAAACH5BAUUAAoALAAAAADIADIAAAT3UCkThA1G6s27/2AojmRpnmiqaoblWtkqz3Rt3/j07nHu
+/8CgcFOxEAiDxGXIbDqfIBehMEC8oNisFmcEHACDnXhMLpvP6LR6zW673+xp9bqt2++houCYXOL/
+gHUtZD2BhodDgzyIjI0/FC4YjpOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqusra6vsLGys7S1tre4
+ubq7vL2+v8DBwsPExcbHyMnKy8zNzs/Q0dLT1CqQF4XVm4ov2dqX3IvfmUUJA0eR45kvCAMFBHDx
+8vP09fb3ZANeAPAC6pjs3PXz989SuXMDAxS0FK7bQoZjvD1sdE2AJAURAAA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-bits-rtl.svg b/mp-wp/wp-admin/images/menu-bits-rtl.svg
--- a/mp-wp/wp-admin/images/menu-bits-rtl.svg false
+++ b/mp-wp/wp-admin/images/menu-bits-rtl.svg 732326351195a762ff6b8f7d0fb8678ef6ccbefa5b32281182bcf9593f00948a02eba81325dc3ccfcb3ba03506541df6de57e85552c59d2517f0bc3929e17fff
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="60px" height="380px" viewBox="0 0 60 380" enable-background="new 0 0 60 380" xml:space="preserve">  <image id="image0" width="60" height="380" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhPAB8AdU3AICAgIqKinx8fG1tbZiYmIiIiPf39+Dg4FtbW+Pj43Jycnd3d////35+foOD
+g25ubnl5eXZ2dnBwcHFxcW9vb4WFhYaGhoKCgnR0dISEhHp6eomJiX9/f3Nzc8zMzPn5+dTU1O/v
+7+fn56Ghoevr6+rq6uXl5YeHh+Tk5PX19ZGRkfj4+Ozs7Pz8/PLy8uLi4vHx8fT09OHh4fv7++3t
+7fPz8+np6QdJdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADcALAAAAAA8AHwBAAb/QIBw
+SCwaj8ikshhoOp/QqHRKrVqv2Kx2w+16v+CweEz+Fs7otHrNbrvf8Lh8TrfY7/i8fs/v+/MVgYKD
+hIWGh4iJhBmMjY6PkJGSk5SPDpeYmZqbnJ2en5oXoqOkpaanqKmqpUutrq9KHLKztLW2t7i5urUN
+vb6/wMHCw8TFwALIycrLzM3Oz9DR0tPU1RrX2Nna29zd3t/aEOLj5OXm5+jp6uUL7e7v8PHy8/T1
+8BH4+fr7/P3+/wD3YRhIsKDBgwgTKlxosIPDhxAjSpxIsaLFiAoyatzIsaPHjyBDcpxAsqTJkyhT
+qlzJ8qSElzBjypxJs6bNmzIp6NzJs6fP/59Agwrt+aCo0aNIkypdyrQp0gFQo0qdSrWq1atYs2rd
+yrUrrK9gW90YS7as2bNo06pdy7at27dw48qdS7eu3bt48+rdy7ev37+AAwseTLiw4cOIEytezLix
+48eQI0ueTLmy5cuYM2vezLmz58+gQ4seTbq06dOoU6tezbq169ewY8ueTbu27du4c+vezbutgQOb
+fwcHrll4ceKZjSdHjll5c+aXnUeHbll6deqVrWfHTll7d+6TvYcHL1l8efKRzQs2AMKD+/ceQJhV
+vx6E/fvy56MfLAK+hxBn0TdYe+5hJ6BgIbxnAFoHCnaAB9w1GBh7DKQl4YRqXaiYholxiP+Yh4eB
+aJiIhZFImImDobjefo+pOCGLjrkImIx/0eiXjX3hyJeOe/Gol495AYmXkHcRaZeRdSFJl5JzMSmX
+k3FBCZeUb1HplpW+wdgYlmxxuZaXGWrJGJgWirkYmQyauaGaHbL5oZshwjminCXSeaKdKeK54nC9
+9ennn4AGKuighA5GAAKbHZooopop2iijmTkaKaSYSVoppZdZmimmlmnaKaeVeRoqqJSJWiqpk5ma
+KqqSqdoqq5G5GiuskMlaK62AEaDrrryaZStgC/DK6wK+4gqYCsISEMBZvwKmQLJoNQvYCbwKEK2x
+ge2qQlrSAgaArgpwi222J6jV7WLnKpb/bmLrItbuYe8aFm9h8xJWr6Hjopuvuvuy26+7/8IbsLwD
+01uwvQfju+jCjzI8qcOXQrypxJ9SPKrFp2K8qsavcjyrx7eC/Ni9gpGcbcIlo3xyoSy37LJaI3AW
+82Yza5YAZzdvlrPNOPess888/yx00ERj9oEImbVAAgoAXgaDDCx88IFlKaBQQgpST00ZCSK4kLXU
+loVwAA1fXzZDCSaEADZmK5hgQwyb1fAC0JntXDfdmNmdN96X6d0335b5HTjglQleOOGUGZ444pMp
+3jjjkjkeOeSRSV455ZBZnjnmj2neOeeOeR466I2JXjrpjJmeOuqLqd4664q5HjvsicleMTvtiNme
+O+6H6d4774b5HjzwhQlfPPGEGZ/8y8w37/zzZjEg/fTUV2/99dhnr331QQAAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-bits.svg b/mp-wp/wp-admin/images/menu-bits.svg
--- a/mp-wp/wp-admin/images/menu-bits.svg false
+++ b/mp-wp/wp-admin/images/menu-bits.svg ebd1b41ab7899e8dc67da7cd442db5dea572403a68f3d27a1ec872db842cf2968009d4e40d5a07915281d40ffdb211882de94367cdb331802e6f9891039a1aae
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="60px" height="380px" viewBox="0 0 60 380" enable-background="new 0 0 60 380" xml:space="preserve">  <image id="image0" width="60" height="380" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhPAB8AdU1AICAgHx8fIqKim1tbZiYmIiIiPf39+Dg4OPj43Jycnd3d////3FxcXZ2dm9v
+b3BwcHR0dG5ubnl5eYaGhn9/f4mJiXNzc35+foODg4WFhXp6eoSEhIKCgszMzPn5+dTU1O/v7+fn
+5/X19ZGRkeTk5Ovr6+rq6oeHh+Xl5ezs7OHh4enp6fv7+/j4+OLi4vPz8/Hx8fz8/PT09PLy8u3t
+7f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADUALAAAAAA8AHwBAAb/QIBw
+SCwaj8iksihoOp/QqHRKrVqv2Ky2wu16v+CweEz+Fs7otHrNbrvf8Lh8Tp/Y7/i8fs/v+/MZgYKD
+hIWGh4iJhBuMjY6PkJGSk5SPGJeYmZqbnJ2en5ocoqOkpaanqKmqpUutrq9KFLKztLW2t7i5urUX
+vb6/wMHCw8TFwAHIycrLzM3Oz9DR0tPU1RrX2Nna29zd3t/aEuLj5OXm5+jp6uUK7e7v8PHy8/T1
+8A34+fr7/P3+/wD3QRhIsKDBgwgTKlxo0ILDhxAjSpxIsaLFiAkyatzIsaPHjyBDcmRAsqTJkyhT
+qlzJ8uSDlzBjypxJs6bNmzId6NzJs6fP/59AgwrtGaGo0aNIkypdyrQp0gFQo0qdSrWq1atYs2rd
+yrUrrK9gW9UYS7as2bNo06pdy7at27dw48qdS7eu3bt48+rdy7ev37+AAwseTLiw4cOIEytezLix
+48eQI0ueTLmy5cuYM2vezLmz58+gQ4seTbq06dOoU6tezbq169ewY8ueTbu27du4c+ve7fiAgc2+
+gf/WHJz48MzFkR/HnJz58svNoT+3HJ369MrVsV+nnJ379sndwX+XHJ78+Mjl0T//0KG9+w4fzgeu
+/qG+/fiNq4N43yFE7+sHuPfBY9kZ4B4IBG4X4AGQdbcAfgmqJV9h6TU44X/CZWichspx6P+ch9KB
+aJ2I2pHonYnioWieiuqxaKGLEW4oY4czflhjiDeOmGOJO57YY4o/rhhki0O+WCRvSCap5JJMNunk
+k4ABQMBmUlI5pWZVYnllZllyuSVmXYL55WVhkjmmZWWieWZlabK5JmVtwvnmZHHSOadkdeJ5Z2R5
+8rknZH0C+udjZRJg6KGIMlamAogiqoCiZwrQKAEjNNbmpAlYumYAiJ7gWJwjHEromwkYCsCoap0w
+6GCBoqqllbC+KquXsdI6q5i14nqrmbnyuquavQL7q5vBEjusnMUie6ydyTK7rJ7NQvusn9FSO62g
+1WJ7LZTcdustApyBu5m4mpGbmbmYoXvHmbqWsVuZu5TBO5m8ktEbmb2Q4fuYvo7x21gIHmwGAgkl
+xJCZBx6koAIMmCHsgQgmkCCCZQ4jPEMIJVRWMQ0HIKixByCgYAILl8mwAgotZObCC+OG63LLMJf7
+sswxnzuzzTWne7POOa+7s889t/uz0EG/O7TRRcd7tNJJz7u0003X+7TUUd87tdVV53u11lnvu7XX
+Xff7tdhhN+YvY2cvlrZiayfWNmJvHxa3YXMXVre3eOet996TLeD334AHLvjghBdueOBBAAA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-dark-rtl.svg b/mp-wp/wp-admin/images/menu-dark-rtl.svg
--- a/mp-wp/wp-admin/images/menu-dark-rtl.svg false
+++ b/mp-wp/wp-admin/images/menu-dark-rtl.svg a65d3d6eafe62904a2370315b3e8e55b40452c5aaf61d21a05b379228f662e1c1bedee6c885f328292ec31e5aefee253f6c91594f33d1c8ecd0028eaa2696661
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="100px" viewBox="0 0 8 100" enable-background="new 0 0 8 100" xml:space="preserve">  <image id="image0" width="8" height="100" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhCABkAPcWAKqqqvn5+fz8/OHh4bS0tM3NzcbGxubm5s/Pz9bW1vHx8cvLy9nZ2e7u7rm5
+ub+/v7q6uv7+/tra2ry8vPf39+/v7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABYALAAAAAAIAGQA
+AAiTAC0IHGgBAMGBBg8WVLhQYcKDDwcKiGhhAIECAxtMMHAggAUKCyBICEAyAgIHDEiSFFjhAceV
+Ay0WUHBQQAKKAnE2hMhQp8+eQB0G5Sm0KNGjBH8aTTqU6VKETaE+zRmV6tSdTpFK1WqVK9atWcOC
+HdtVbFmyX8+qTctWqVe3ZttWlXsVLlq7a/HSfTtXr9++fQMCADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-dark.svg b/mp-wp/wp-admin/images/menu-dark.svg
--- a/mp-wp/wp-admin/images/menu-dark.svg false
+++ b/mp-wp/wp-admin/images/menu-dark.svg cb973ce13105f5c481863367eacdc5c5dd896b3b456733b0da462b7f2038992190d4bfc56fc4e79aff3f794ffaedeb09954671e742a7ebebbd0f2990f497df01
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="100px" viewBox="0 0 8 100" enable-background="new 0 0 8 100" xml:space="preserve">  <image id="image0" width="8" height="100" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhCABkAMQWAKqqqvn5+fz8/OHh4bS0tM3NzcbGxubm5s/Pz9bW1vHx8cvLy9nZ2e7u7rm5
+ub+/v7q6uv7+/tra2ry8vPf39+/v7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEA
+ABYALAAAAAAIAGQAAAVyIGCNpCWW44mqJUu6qYBaBTGgwWFMDRn8EsiCYvn9GA5E5Kd7VEaK2u2V
+kLVmJiwsO9t6teBueDW+is9ktDnNXrtfZbha3qa/U3H8XF/n37l9gH9fe4J2h36IhomMi46EgZCD
+eY+UkoqXjZmVhZuelpQhADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu-vs.svg b/mp-wp/wp-admin/images/menu-vs.svg
--- a/mp-wp/wp-admin/images/menu-vs.svg false
+++ b/mp-wp/wp-admin/images/menu-vs.svg 8e1bda905ddff051ec9ad763085f5b6dd264072f9d139f095c50a2ed9e6afdc015d490c754c502938c27e21410c8135faa15a5be25fe14f4575f9ab05b0fc6d7
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="330px" height="64px" viewBox="0 0 330 64" enable-background="new 0 0 330 64" xml:space="preserve">  <image id="image0" width="330" height="64" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/menu.svg b/mp-wp/wp-admin/images/menu.svg
--- a/mp-wp/wp-admin/images/menu.svg false
+++ b/mp-wp/wp-admin/images/menu.svg a2a3e8015a9dd35529149429fa86c78ad043d8e0803f4c40e8a96d3ec75d06cfcb58992f2f527572c635b139a7732d50550bcdacabef0b8229cbc101aaf392f7
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="360px" height="64px" viewBox="0 0 360 64" enable-background="new 0 0 360 64" xml:space="preserve">  <image id="image0" width="360" height="64" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+IaOU8P8CDACN7P1wVHsi9QAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/no.svg b/mp-wp/wp-admin/images/no.svg
--- a/mp-wp/wp-admin/images/no.svg false
+++ b/mp-wp/wp-admin/images/no.svg 08a4d1623ce5d7d96c41fbfb3d74a9589bb08c55b3bd3bf986f1339b12ef4337e7fd940bee6e19050f7e3a4fb9075a9905f722311565458bd687cbcd83205d3c
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC30lEQVQ4jaWRz2+TBRzGP9+3P9du
+a2nXdp0zS4GNlSnDTTcxkIHGUUOMhoOKB+PNPwBP/hM6Y+KFExCIUUY0HPRgRESSiT+GEPYLyUaa
+dV23tuv2tn3bvu/XAz1490mew3N4njzJR1SV/yMxxIejFnFgJhz56NlKcXnT4ScBsoAf6AS8wAt+
+45U7nq7R87s7X+YBbyCIgBto4YPR+mp+nsW/uJrJeL3QXG8PBAADOHfxsuq+OME3pydqcNfV0YEB
+LYCXPx+fnCdfguQhxk9NNSyg2bYFTEy/oRw5jjxzgJnXMr8BJ2zbRoD91je//ONdXYIb17GDEVwv
+vcjC9Qtcu3df/MDrY5M6mnmHxoN7eGnBUJr72S2OfP3FiAC4w73V+VR/x8jSMoVmHXwBYj1RSm+9
+TT2XIzk3R6FSgapJzOthLRwmtbGNYgkA+5IpgAePI1Gtg94E/Rm0PJjWQjKpt0Bvg1ZBF0GBta5g
+FPx+BKCjf5BadoUYzM12dU6Ud/fYAFxtVC6gBxDDxYeO/XATRnyhBFajgqxNnuTXuZvsASuAZzD9
+faZWPb2QXcP+D+/nYgm+c3tuSy57YpinN5LdEYwN22YLKAEmcHK3fNoy9ygBNaABlIGKVWfa5Tpu
+tnMR2ALcdceh2i5/EO9TK7/OisIhINa+nwOKlR0OmlXejyf0x828AFgoRtNuUQf3VDCoRiHHnsJh
+njowNo7/2DGeB1JA0W7SWSwxFQ1pDQItRzGajUb0k08/a3abJiVVBtrlP8Jhth49nF1fmL90NxLi
+KNAPFFoNQts7fHz2XbOpTh93zrzHrZ5u/Rv0EagFeiUe06zPvfxDKMCNcIBVj+vPK4lebYE+Bl3q
+DurvyV6dEcFwUFREtoEDw2muDQ/zaqHwxIYhB0FFsGFsqphf/CqeIJXoo1wxccQQxMBQBBvBBpkd
+2s+56VPYyoCjirZxOQq2o+mzQwN8mz6IA6IiOCL8C2ZiPnhZ5r4bAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/required.svg b/mp-wp/wp-admin/images/required.svg
--- a/mp-wp/wp-admin/images/required.svg false
+++ b/mp-wp/wp-admin/images/required.svg ee66eeb74965a182755e4a7d7123598f17dd1dfc1669f3c2d8151361c13f77d8a2a18cec3cd8d265b72e2cdaf0cb65c16f3e4fd406c4438287ed10b0112d462b
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEAAQAIAAAP8AAP///yH5BAUUAAEALAAAAAAQABAAAAIVjI+py+0HwAuxSmdnfnv6D4bi
+SCYFADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/resize.svg b/mp-wp/wp-admin/images/resize.svg
--- a/mp-wp/wp-admin/images/resize.svg false
+++ b/mp-wp/wp-admin/images/resize.svg f3f1e0b33edf93ffe9adcf5da9c2441ecd1f25da7316a0942f949b4c8db4f737f543b10c6f8c6e264f4180552b5770a1a25ed2d69f81bb1c23f7416cd161325b
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="11px" height="11px" viewBox="0 0 11 11" enable-background="new 0 0 11 11" xml:space="preserve">  <image id="image0" width="11" height="11" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhCwALAJEAAP///8PDw////wAAACH5BAUUAAIALAAAAAALAAsAAAIYlI+BG7DXnomKuZiu
+y4JC3W0UGJbYWBoFADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-left.svg b/mp-wp/wp-admin/images/screen-options-left.svg
--- a/mp-wp/wp-admin/images/screen-options-left.svg false
+++ b/mp-wp/wp-admin/images/screen-options-left.svg 6ab564a84c795a2263abf5b962d0f16a315d44bf390808db960e915f445f532d66af8876015408f4791a9334f9b2aa52dc5dbc1751907a0bd227fdff661c52d3
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="250px" height="23px" viewBox="0 0 250 23" enable-background="new 0 0 250 23" xml:space="preserve">  <image id="image0" width="250" height="23" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlh+gAXAMQAANbW1uPj49ra2uDg4NTU1P7+/uTk5OHh4d7e3tvb2+Xl5dXV1eLi4t/f39zc
+3NnZ2ebm5ujo6NjY2NfX19PT0+fn5wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAA
+AAAALAAAAAD6ABcAAAX/YCSOZGmeaKqubOu+cCzPdD1XeK7vfO//wKBwSCwaj8ikcslsOp/QqHRK
+reog2Kx2y+16v+CweEwum8/otHqdVrjf8Lh8Tq/b7/i8fs/v+/+AgX8GhIWGh4iJiouMjY6PkJGS
+k5SVlpeVAZqbnJ2en6ChoqOkpaanqKmqq6ytqwywsbKztLW2t7i5uru8vb6/wMHCw8EHxsfIycrL
+zM3Oz9DR0tPU1dbX2NnXA9zd3t/g4eLj5OXm5+jp6uvs7e7v7Q3y8/T19vf4+fr7/P3+/wADChxI
+sOBABAgTKlzIsKHDhxAjSpxIsaLFixgzatyY0YHHjyBDihxJsqTJkyhT/apcybKly5cwY75MQLOm
+zZs4c+rcybOnz59AgwodSrSo0aNFBShdyrSp06dQo0qdSrWq1atYs2rdyrXr1gdgw4odS7as2bNo
+06pdy7at27dw48qdG1eC3bt48+rdy7ev37+AAwseTLiw4cOIEx+ewLix48eQI0ueTLmy5cuYM2ve
+zLmz58+dAYgeTbq06dOoU6tezbq169ewY8ueTbv27AW4c+vezbu379/AgwsfTry48ePIkytfnlwC
+gefQo0ufTr269evYs2vfzr279+/gw4v/HoGC+fPo06tfz769+/fw48ufT7++/fv489svUGGC/v8A
+BijggAQWaGB8IQAAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-right-up.svg b/mp-wp/wp-admin/images/screen-options-right-up.svg
--- a/mp-wp/wp-admin/images/screen-options-right-up.svg false
+++ b/mp-wp/wp-admin/images/screen-options-right-up.svg 2c13cdee744499b78f71ab4a4e9838cbf6555945b60a04656a2c88d845f6ab737dbe6f025217b7897ebf7132fea2186fe42b7845baadebf555c363271ca26120
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="23px" viewBox="0 0 19 23" enable-background="new 0 0 19 23" xml:space="preserve">  <image id="image0" width="19" height="23" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEwAXAMQAAN/f39zc3Nvb29ra2ru7u9nZ2b29vdDQ0L6+vr+/v8TExMvLy/7+/sPDw8HB
+wcnJyd7e3tTU1ODg4OTk5OHh4ejo6OXl5dXV1eLi4ubm5uPj49bW1tjY2NfX19PT0+fn5yH5BAAA
+AAAALAAAAAATABcAAAWTYCWOZEl+aKqubOuiWSzP9GzdeK7nU+//wJ9mSCwai5ikcslcUp7QqDQq
+qVqtgqsWwO1yAwiO1wspm8sPQuN8DrjfgQ5hfoC/Bfi8QDEnJAZ6eAODhAd9cwuEhAWMjQ4GkJAI
+G42MHJeYmZqZHZ2en6CfG6OkpaalF6mqq6yrEa+wsbKwHB62t7i5tx+6vbcdHwwhADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/screen-options-right.svg b/mp-wp/wp-admin/images/screen-options-right.svg
--- a/mp-wp/wp-admin/images/screen-options-right.svg false
+++ b/mp-wp/wp-admin/images/screen-options-right.svg 3ce1986903c276e5d419bfb8d4fb1ca854223f72f403845620b5310dea2e47f4758816d88c2d973992e0f86451fedbf393b933768bd8dbfa2123bd78133b0bbb
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="23px" viewBox="0 0 19 23" enable-background="new 0 0 19 23" xml:space="preserve">  <image id="image0" width="19" height="23" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEwAXAMQAANra2tvb29zc3N7e3ru7u9/f3729vcLCws3Nzb6+vsjIyL+/v/7+/tDQ0MTE
+xNnZ2eTk5NTU1OHh4ejo6NjY2OXl5dXV1eLi4ubm5uPj4+Dg4NbW1tfX19PT0+fn5wAAACH5BAAA
+AAAALAAAAAATABcAAAWR4CSOZEl6aKqubOuiWCzP9FzdeK7nUO//wF9mSCwai5ekcslcSp7QqDSq
+qVqv2GthuxUkDGDwgcsdmM8IglrdOZ8F8HhgsXbE74G8PtBYb/Z6AIKDggcECoSED4uMix0GHI2N
+FJSVlRGWmRybnJ2enRuhoqOkoxanqKmqqRGtrq+wrhQdtLW2t7UeuLu1HB4MIQA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/se.svg b/mp-wp/wp-admin/images/se.svg
--- a/mp-wp/wp-admin/images/se.svg false
+++ b/mp-wp/wp-admin/images/se.svg 4ada0d9ca918ce279ba1902a9deb2ca487b7bd28adb17b6aa5dc9c7fd20b733be45d1d53e9ad0fee74523a4c0c6288fc7f38894f0d9e7dba0b674df9aef3051e
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">  <image id="image0" width="10" height="10" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKAQMAAAC3/F3+AAAABlBMVEX///+Dg4aixJs6AAAAAXRS
+TlMAQObYZgAAACdJREFUeF4FwEEJACAQBMARwZcFLsd1MsfWsJOhhBgxWeyoaA4vbj45LgUuKI7V
+KwAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/star.svg b/mp-wp/wp-admin/images/star.svg
--- a/mp-wp/wp-admin/images/star.svg false
+++ b/mp-wp/wp-admin/images/star.svg c6722104c5034247692454f4f000f0d5e63f3929346269dc3d1b5d2936de450ab93f1dcad0b0ca0260c0291cbb86a9e19866b875ba8e286a08c174a55bf903ef
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="19px" height="19px" viewBox="0 0 19 19" enable-background="new 0 0 19 19" xml:space="preserve">  <image id="image0" width="19" height="19" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhEwATAKEAAAAAAP///wAAAAAAACH5BAEKAAIALAAAAAATABMAAAI+jH+AywaimnxRrieg
+vVnv1FUXQJJdVpYBdrauwrovKLfiGts3bW85avmFJqfYblVEDjmQCgCzozSkjKMDUQAAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg
--- a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg false
+++ b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg 84abf66c99347a7b5931bf35124e643507550246ab00790e8d9ccef40e5c030d65c82a5a95680f15c9c4ecd3b5f884ca65ab083ec2f043d85c520e055aa23ee5
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="8px" viewBox="0 0 20 8" enable-background="new 0 0 20 8" xml:space="preserve">  <image id="image0" width="20" height="8" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhFAAIAJEAAP///yWDrbKysgAAACH5BAEAAAEALAAAAAAUAAgAAAIZjGGpq4AMk3ts2hvD
+RTbrKTnet4gjRJ1BAQA7
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/toggle-arrow.svg b/mp-wp/wp-admin/images/toggle-arrow.svg
--- a/mp-wp/wp-admin/images/toggle-arrow.svg false
+++ b/mp-wp/wp-admin/images/toggle-arrow.svg 55ae57e83727710d8db8ac426770543094baef39db7cf40d83885dbb28d55e0a88bae87d13678da4b03d2e9e275b9a5bdb581118fcc8686f6b6c3bd5219546f0
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="8px" viewBox="0 0 20 8" enable-background="new 0 0 20 8" xml:space="preserve">  <image id="image0" width="20" height="8" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhFAAIAJEBAP///yWDrbKysgAAACH5BAEAAAEALAAAAAAUAAgAAAIYRI6pCbbPGgyt2jqv
+sZNi73TSMXZLaCoFADs=
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/wheel.svg b/mp-wp/wp-admin/images/wheel.svg
--- a/mp-wp/wp-admin/images/wheel.svg false
+++ b/mp-wp/wp-admin/images/wheel.svg a621dd6fb483f711896eb30f0debe642942c2dd5e257b295ffc797698464692de03c51e736a5377c79b428209f779296d663a1dd2dc61bbffc31e35112057b61
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="195px" height="195px" viewBox="0 0 195 195" enable-background="new 0 0 195 195" xml:space="preserve">  <image id="image0" width="195" height="195" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/white-grad-active.svg b/mp-wp/wp-admin/images/white-grad-active.svg
--- a/mp-wp/wp-admin/images/white-grad-active.svg false
+++ b/mp-wp/wp-admin/images/white-grad-active.svg 0b7ec8154ecaa06915932364cb84370a2c0fb71a421e6a4f8fbf415cd56ea15cd8b75e890ef44b5946ccf41c97c0633f2de1d4e61f9aa8c300bcca40cfb7a4f1
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAMAAADToCSPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAADlQTFRF7+/v8PDw8vLy7e3t+fn5////+/v7+Pj49PT0/f399vb27u7u
+8fHx/v7+/Pz89fX19/f38/Pz+vr68z2vlQAAADxJREFUeNpMxDkSgDAAxDBzE87A/x/LeLIFKsQg
+2rv465QP0Ss/YlW+xaZcxaI8Kr9iVr5EUT7FpPYnwABZDwRrFJ+PLwAAAABJRU5ErkJggg==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/white-grad.svg b/mp-wp/wp-admin/images/white-grad.svg
--- a/mp-wp/wp-admin/images/white-grad.svg false
+++ b/mp-wp/wp-admin/images/white-grad.svg 2f92c9844b3f390e433c6df3b8f5304fcef6c0e85b80dde8f4972b349f4457e4f36b3c41c54a74715965fbbf944786f220b21bf02fc1aa1109b125d1e4a26a61
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="5px" height="30px" viewBox="0 0 5 30" enable-background="new 0 0 5 30" xml:space="preserve">  <image id="image0" width="5" height="30" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAALEgAACxIB0t1+/AAAACF0RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgNC4w6iYn
+dQAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8xNy8wONpsdXEAAAAlSURBVHicY/z///9/BjTAhC7A
+wMDAwIJFIXbBoaJ9qLhz+IUSAIMMOibeSzRBAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/wordpress-logo.svg b/mp-wp/wp-admin/images/wordpress-logo.svg
--- a/mp-wp/wp-admin/images/wordpress-logo.svg false
+++ b/mp-wp/wp-admin/images/wordpress-logo.svg dab33b25841c706fd49dddbb34cba56408eeebee53190302a15a9dfef12241ab05c9816bdecb080379c3b89a47ff76f30a86cecf87053df783c69fd775367643
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="250px" height="68px" viewBox="0 0 250 68" enable-background="new 0 0 250 68" xml:space="preserve">  <image id="image0" width="250" height="68" x="0" y="0"
+    xlink:href="data:image/png;base64,
+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
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/wp-logo.svg b/mp-wp/wp-admin/images/wp-logo.svg
--- a/mp-wp/wp-admin/images/wp-logo.svg false
+++ b/mp-wp/wp-admin/images/wp-logo.svg eafc8b8af0024ae548f17132fb1b0ccf1962cfc7a55b254f00e8707c01a0c0676532ff0781aba8b8031e88d656b7c4edbefda845541641ab0dace6fadb329c86
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px" height="31px" viewBox="0 0 30 31" enable-background="new 0 0 30 31" xml:space="preserve">  <image id="image0" width="30" height="31" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhHgAfAOZdAJaWlpOTk5GRkZCQkI2NjY6Ojo+Pj5eXl1RUVJKSkpSUlFNTU0pKSkJCQmlp
+aT4+Pjc3N2VlZUBAQENDQ2xsbJWVlYqKijk5OYiIiIKCgoyMjFxcXEtLS21tbWRkZIODg3JyclZW
+VlFRUVdXV0VFRUlJSX9/fzo6OnNzc2pqanp6ejExMYCAgImJiVpaWl1dXW5ubj09PYeHhzMzM2Zm
+ZouLi3t7e2FhYV9fX4aGhmNjY0ZGRm9vb3R0dDIyMjg4OISEhIGBgWtrazY2NjAwMEFBQZiYmH19
+fVtbW0RERE5OTnd3d0dHR1JSUmhoaHFxcVVVVTQ0NIWFhUxMTHV1dWdnZ1hYWGJiYk9PT3l5eXx8
+fF5eXnZ2dkRERAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5
+BAEAAF0ALAAAAAAeAB8AAAf/gF2Cg4QPP1ErREQ+UT8PhJCRghMXK00wGQlGRgUZME0rFxOSkQ8Q
+NAEBKg4hrSEOKqk0EI+kghAiCQQeFzNDHMAcQzMXHgQJIhC2ECAHDhcQEUAH1NVAERAXDgcgypHM
+AgszEQLV5tUCETMLAt2QD08DCxcfAPb3+Pg5JQgDT7VdJogAgIBevoP3BuBg0AUBABGjukgY4KCB
+FIQYNxByMECCIA8WumDp0MEDgxYVXlgh2SEFhw8VKogYdGKCBQ9dHhjQccFjlxsxY35oIGiLgaAe
+iHaJIEGHgQchCizlIGiBgqtXXQhigFVBgYghInQpEEJIjwkZHAxq0ZWLUhVd/3kIqpJhQg8hNiIk
+CVCgFo9UgHcIugI4laC/SSLYKIAAQaoFVQsH0LFVskQZARoXSNA4QQIqEWV49kxjUJbRCbow8NxZ
+QGMBsJXCgA17yg9BN2hr6eIE9usaIkbQHlGVdpAdTrbSjvBAA+wRImrYWDigugmlOapHeAGk1pLq
+SvpVZ4DDBgUKXYJUH0BCUIfqU0wMQIB7QI4uFKoHwU/hhYUYKRgg4A1VGcDCDgJSMAoDBlDwgAUC
+phCDBS90YQEUDEBowAc+SeHBCwJaoNQSIywQIgNQhNSFAx+ckEIBMJYgCAwcHAFjAcR1McIEFMCY
+wgkfqNVFCS24IAELMKK31aWNBYCgVAMtFMCCBC60IKMgGxDQAAkmEIBBLTQQIKaY7elIgAkkNECA
+RoSggMGWLBAAmQQZjCkmmz2wkCYGKEjiZhEnONAnB3aKeQRRDpxQBJ+2gKCBCz7E0IUHGlRqqQlK
+xOCDCxqAYAuWGGSwwAoQSLDAqQtIAMEKC2SAAZufDukABjJ0sAEDTDDBwAYdyICBA1fGSggSFKiQ
+QQ01ZKACBUh8GggAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/xit.svg b/mp-wp/wp-admin/images/xit.svg
--- a/mp-wp/wp-admin/images/xit.svg false
+++ b/mp-wp/wp-admin/images/xit.svg 2070e95c9e218f70e6d31b243c91159a7584ca293795eea88f9157ec048ada230a07d3db84b1053691d34dc1ff109ff6e444e92490b16856716bf73b5f779791
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="10px" viewBox="0 0 20 10" enable-background="new 0 0 20 10" xml:space="preserve">  <image id="image0" width="20" height="10" x="0" y="0"
+    xlink:href="data:image/png;base64,
+R0lGODlhFAAKALMAAODg4PjIyPa3t8jIyPrY2Onp6dbW1vOenubm5vnT0/KTk8LCwv///wAAAAAA
+AAAAACH5BAAAAAAALAAAAAAUAAoAAARikLFixjBFSiLOEYQGLGQJSIGirsG0MAiJMEtBKEyiJoxC
+GIsZQrgwCBS8RFIhGMgkscXgsJPoFAdnEEqaVnOqA1BINCJzS0HhFZ3VbuCzjzEqkU6M1ErVklAs
+GBoMHB4gEhEAOw==
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/images/yes.svg b/mp-wp/wp-admin/images/yes.svg
--- a/mp-wp/wp-admin/images/yes.svg false
+++ b/mp-wp/wp-admin/images/yes.svg 389f7e705af0e96883c3b0cdbe428b9324e439c32288992bbb98fd70c7f4c101173ac77794a8e6a29bf2a7b96d6ceb0a355b25fccff5c7a583127cbdea34dead
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
+    xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACK0lEQVQ4jaWSXUhTYRjH/+/O3uPO
+Ofs4W2oRRGI0jPYRStaIjMS6SyQoC+kD0rqJwAjqqo+bbpLoQorIhjaShIqRLUtzdaHDDywpmzZ0
+NIS0rDV1tg87e7uQRMps1R+em+fh91z8+RHGGP4nqr8FhFqi/ucHopNI8qip23RQbplfMsbSGuEG
+pOVn5P72wVZ2wLmXqXbhIWMMJJ0OhGtEMoRk363DjbaGrjqMJcchJw1wP3jcPP8gq5FfBkZyJyoS
+vQthfT2RMob0PldVo83lv4nWTx5wMYpZLw0mZqIFKgDQ1JJM80d7YEPY0SHVk+0/4JX3Ja32ndHn
+On7b1jTegF7aAS3VIeyJDUenI5Zoy2xEnX1RzC4WS/zVpdWmqBLFpCfiWXFXs1MStT10SNdZc+Sy
+rfnzPQzS1xATOvibQiMklbImnrA4AHCKTK4XlTgKPwjviSwaUZCXT/u8A+UI0apzlWfNL+M9CHBv
+oEwR9DsDQS5LscbvzMEA5koUyjRP83av2movtPP5uo2ghIeBGjGovMII3mL6ywye1XQH+U1JS/io
+ElvYkRoAYu54CVemaoOMIrb5G2/m1yHMTWCCG4MyBXRcfRHMqchcP1A8GsdPmbdKcad20D2qdllv
+2mLcZswQiIDUJPD8UlfQccJqebS28xd4UZEy9qnbyntLExfCp1nuqZzhk18rNUsJtuhSd0j0rjm/
+uq+OXRH+ZOhvD8fi+2k6iqel8lL5Dvo2ZEkd1D8WAAAAAElFTkSuQmCC
+" />
+</svg>
diff -uNr a/mp-wp/wp-admin/import/blogger.php b/mp-wp/wp-admin/import/blogger.php
--- a/mp-wp/wp-admin/import/blogger.php false
+++ b/mp-wp/wp-admin/import/blogger.php 4b8f4fa9b2b81709d307fb19ff5bb38006a93b29f9abd31a6b13026db2aaffbecc26f6e94101315ef8e62fff8ef600c85690b87b20b0d481757dd6760d251bde
@@ -0,0 +1,1061 @@
+<?php
+/**
+ * Blogger Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * How many records per GData query
+ *
+ * @package WordPress
+ * @subpackage Blogger_Import
+ * @var int
+ * @since unknown
+ */
+define( 'MAX_RESULTS',        50 );
+
+/**
+ * How many seconds to let the script run
+ *
+ * @package WordPress
+ * @subpackage Blogger_Import
+ * @var int
+ * @since unknown
+ */
+define( 'MAX_EXECUTION_TIME', 20 );
+
+/**
+ * How many seconds between status bar updates
+ *
+ * @package WordPress
+ * @subpackage Blogger_Import
+ * @var int
+ * @since unknown
+ */
+define( 'STATUS_INTERVAL',     3 );
+
+/**
+ * Blogger Importer class
+ *
+ * @since unknown
+ */
+class Blogger_Import {
+
+	// Shows the welcome screen and the magic auth link.
+	function greet() {
+		$next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&amp;noheader=true';
+		$auth_url = "https://www.google.com/accounts/AuthSubRequest";
+		$title = __('Import Blogger');
+		$welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
+		$prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).');
+		$stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
+		$auth = __('Authorize');
+
+		echo "
+		<div class='wrap'>
+		".screen_icon()."
+		<h2>$title</h2>
+		<p>$welcome</p><p>$prereqs</p><p>$stepone</p>
+			<form action='$auth_url' method='get'>
+				<p class='submit' style='text-align:left;'>
+					<input type='submit' class='button' value='$auth' />
+					<input type='hidden' name='scope' value='http://www.blogger.com/feeds/' />
+					<input type='hidden' name='session' value='1' />
+					<input type='hidden' name='secure' value='0' />
+					<input type='hidden' name='next' value='$next_url' />
+				</p>
+			</form>
+		</div>\n";
+	}
+
+	function uh_oh($title, $message, $info) {
+		echo "<div class='wrap'>";
+		screen_icon();
+		echo "<h2>$title</h2><p>$message</p><pre>$info</pre></div>";
+	}
+
+	function auth() {
+		// We have a single-use token that must be upgraded to a session token.
+		$token = preg_replace( '/[^-_0-9a-zA-Z]/', '', $_GET['token'] );
+		$headers = array(
+			"GET /accounts/AuthSubSessionToken HTTP/1.0",
+			"Authorization: AuthSub token=\"$token\""
+		);
+		$request = join( "\r\n", $headers ) . "\r\n\r\n";
+		$sock = $this->_get_auth_sock( );
+		if ( ! $sock ) return false;
+		$response = $this->_txrx( $sock, $request );
+		preg_match( '/token=([-_0-9a-z]+)/i', $response, $matches );
+		if ( empty( $matches[1] ) ) {
+			$this->uh_oh(
+				__( 'Authorization failed' ),
+				__( 'Something went wrong. If the problem persists, send this info to support:' ),
+				htmlspecialchars($response)
+			);
+			return false;
+		}
+		$this->token = $matches[1];
+
+		wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) );
+	}
+
+	function get_token_info() {
+		$headers = array(
+			"GET /accounts/AuthSubTokenInfo  HTTP/1.0",
+			"Authorization: AuthSub token=\"$this->token\""
+		);
+		$request = join( "\r\n", $headers ) . "\r\n\r\n";
+		$sock = $this->_get_auth_sock( );
+		if ( ! $sock ) return;
+		$response = $this->_txrx( $sock, $request );
+		return $this->parse_response($response);
+	}
+
+	function token_is_valid() {
+		$info = $this->get_token_info();
+
+		if ( $info['code'] == 200 )
+			return true;
+
+		return false;
+	}
+
+	function show_blogs($iter = 0) {
+		if ( empty($this->blogs) ) {
+			$headers = array(
+				"GET /feeds/default/blogs HTTP/1.0",
+				"Host: www.blogger.com",
+				"Authorization: AuthSub token=\"$this->token\""
+			);
+			$request = join( "\r\n", $headers ) . "\r\n\r\n";
+			$sock = $this->_get_blogger_sock( );
+			if ( ! $sock ) return;
+			$response = $this->_txrx( $sock, $request );
+
+			// Quick and dirty XML mining.
+			list( $headers, $xml ) = explode( "\r\n\r\n", $response );
+			$p = xml_parser_create();
+			xml_parse_into_struct($p, $xml, $vals, $index);
+			xml_parser_free($p);
+
+			$this->title = $vals[$index['TITLE'][0]]['value'];
+
+			// Give it a few retries... this step often flakes out the first time.
+			if ( empty( $index['ENTRY'] ) ) {
+				if ( $iter < 3 ) {
+					return $this->show_blogs($iter + 1);
+				} else {
+					$this->uh_oh(
+						__('Trouble signing in'),
+						__('We were not able to gain access to your account. Try starting over.'),
+						''
+					);
+					return false;
+				}
+			}
+
+			foreach ( $index['ENTRY'] as $i ) {
+				$blog = array();
+				while ( ( $tag = $vals[$i] ) && ! ( $tag['tag'] == 'ENTRY' && $tag['type'] == 'close' ) ) {
+					if ( $tag['tag'] == 'TITLE' ) {
+						$blog['title'] = $tag['value'];
+					} elseif ( $tag['tag'] == 'SUMMARY' ) {
+						$blog['summary'] == $tag['value'];
+					} elseif ( $tag['tag'] == 'LINK' ) {
+						if ( $tag['attributes']['REL'] == 'alternate' && $tag['attributes']['TYPE'] == 'text/html' ) {
+							$parts = parse_url( $tag['attributes']['HREF'] );
+							$blog['host'] = $parts['host'];
+						} elseif ( $tag['attributes']['REL'] == 'edit' )
+							$blog['gateway'] = $tag['attributes']['HREF'];
+					}
+					++$i;
+				}
+				if ( ! empty ( $blog ) ) {
+					$blog['total_posts'] = $this->get_total_results('posts', $blog['host']);
+					$blog['total_comments'] = $this->get_total_results('comments', $blog['host']);
+					$blog['mode'] = 'init';
+					$this->blogs[] = $blog;
+				}
+			}
+
+			if ( empty( $this->blogs ) ) {
+				$this->uh_oh(
+					__('No blogs found'),
+					__('We were able to log in but there were no blogs. Try a different account next time.'),
+					''
+				);
+				return false;
+			}
+		}
+//echo '<pre>'.print_r($this,1).'</pre>';
+		$start    = js_escape( __('Import') );
+		$continue = js_escape( __('Continue') );
+		$stop     = js_escape( __('Importing...') );
+		$authors  = js_escape( __('Set Authors') );
+		$loadauth = js_escape( __('Preparing author mapping form...') );
+		$authhead = js_escape( __('Final Step: Author Mapping') );
+		$nothing  = js_escape( __('Nothing was imported. Had you already imported this blog?') );
+		$title    = __('Blogger Blogs');
+		$name     = __('Blog Name');
+		$url      = __('Blog URL');
+		$action   = __('The Magic Button');
+		$posts    = __('Posts');
+		$comments = __('Comments');
+		$noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don\'t worry, you can turn it back off when you\'re done.');
+
+		$interval = STATUS_INTERVAL * 1000;
+
+		foreach ( $this->blogs as $i => $blog ) {
+			if ( $blog['mode'] == 'init' )
+				$value = $start;
+			elseif ( $blog['mode'] == 'posts' || $blog['mode'] == 'comments' )
+				$value = $continue;
+			else
+				$value = $authors;
+			$blogtitle = js_escape( $blog['title'] );
+			$pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0;
+			$cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0;
+			$init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');';
+			$pstat = "<div class='ind' id='pind$i'>&nbsp;</div><div id='pstat$i' class='stat'>$pdone/{$blog['total_posts']}</div>";
+			$cstat = "<div class='ind' id='cind$i'>&nbsp;</div><div id='cstat$i' class='stat'>$cdone/{$blog['total_comments']}</div>";
+			$rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' class='button' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n";
+		}
+
+		echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><tr><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></tr></thead>\n$rows</table></div>";
+		echo "
+		<script type='text/javascript'>
+		/* <![CDATA[ */
+			var strings = {cont:'$continue',stop:'$stop',stopping:'$stopping',authors:'$authors',nothing:'$nothing'};
+			var blogs = {};
+			function blog(i, title, mode, status){
+				this.blog   = i;
+				this.mode   = mode;
+				this.title  = title;
+				this.status = status;
+				this.button = document.getElementById('submit'+this.blog);
+			};
+			blog.prototype = {
+				start: function() {
+					this.cont = true;
+					this.kick();
+					this.check();
+				},
+				kick: function() {
+					++this.kicks;
+					var i = this.blog;
+					jQuery.post('admin.php?import=blogger&noheader=true',{blog:this.blog},function(text,result){blogs[i].kickd(text,result)});
+				},
+				check: function() {
+					++this.checks;
+					var i = this.blog;
+					jQuery.post('admin.php?import=blogger&noheader=true&status=true',{blog:this.blog},function(text,result){blogs[i].checkd(text,result)});
+				},
+				kickd: function(text, result) {
+					if ( result == 'error' ) {
+						// TODO: exception handling
+						if ( this.cont )
+							setTimeout('blogs['+this.blog+'].kick()', 1000);
+					} else {
+						if ( text == 'done' ) {
+							this.stop();
+							this.done();
+						} else if ( text == 'nothing' ) {
+							this.stop();
+							this.nothing();
+						} else if ( text == 'continue' ) {
+							this.kick();
+						} else if ( this.mode = 'stopped' )
+							jQuery(this.button).attr('value', strings.cont);
+					}
+					--this.kicks;
+				},
+				checkd: function(text, result) {
+					if ( result == 'error' ) {
+						// TODO: exception handling
+					} else {
+						eval('this.status='+text);
+						jQuery('#pstat'+this.blog).empty().append(this.status.p1+'/'+this.status.p2);
+						jQuery('#cstat'+this.blog).empty().append(this.status.c1+'/'+this.status.c2);
+						this.update();
+						if ( this.cont || this.kicks > 0 )
+							setTimeout('blogs['+this.blog+'].check()', $interval);
+					}
+					--this.checks;
+				},
+				update: function() {
+					jQuery('#pind'+this.blog).width(((this.status.p1>0&&this.status.p2>0)?(this.status.p1/this.status.p2*jQuery('#pind'+this.blog).parent().width()):1)+'px');
+					jQuery('#cind'+this.blog).width(((this.status.c1>0&&this.status.c2>0)?(this.status.c1/this.status.c2*jQuery('#cind'+this.blog).parent().width()):1)+'px');
+				},
+				stop: function() {
+					this.cont = false;
+				},
+				done: function() {
+					this.mode = 'authors';
+					jQuery(this.button).attr('value', strings.authors);
+				},
+				nothing: function() {
+					this.mode = 'nothing';
+					jQuery(this.button).remove();
+					alert(strings.nothing);
+				},
+				getauthors: function() {
+					if ( jQuery('div.wrap').length > 1 )
+						jQuery('div.wrap').gt(0).remove();
+					jQuery('div.wrap').empty().append('<h2>$authhead</h2><h3>' + this.title + '</h3>');
+					jQuery('div.wrap').append('<p id=\"auth\">$loadauth</p>');
+					jQuery('p#auth').load('index.php?import=blogger&noheader=true&authors=1',{blog:this.blog});
+				},
+				init: function() {
+					this.update();
+					var i = this.blog;
+					jQuery(this.button).bind('click', function(){return blogs[i].click();});
+					this.kicks = 0;
+					this.checks = 0;
+				},
+				click: function() {
+					if ( this.mode == 'init' || this.mode == 'stopped' || this.mode == 'posts' || this.mode == 'comments' ) {
+						this.mode = 'started';
+						this.start();
+						jQuery(this.button).attr('value', strings.stop);
+					} else if ( this.mode == 'started' ) {
+						return false; // let it run...
+						this.mode = 'stopped';
+						this.stop();
+						if ( this.checks > 0 || this.kicks > 0 ) {
+							this.mode = 'stopping';
+							jQuery(this.button).attr('value', strings.stopping);
+						} else {
+							jQuery(this.button).attr('value', strings.cont);
+						}
+					} else if ( this.mode == 'authors' ) {
+						document.location = 'index.php?import=blogger&authors=1&blog='+this.blog;
+						//this.mode = 'authors2';
+						//this.getauthors();
+					}
+					return false;
+				}
+			};
+			$init
+			jQuery.each(blogs, function(i, me){me.init();});
+		/* ]]> */
+		</script>\n";
+	}
+
+	// Handy function for stopping the script after a number of seconds.
+	function have_time() {
+		global $importer_started;
+		if ( time() - $importer_started > MAX_EXECUTION_TIME )
+			die('continue');
+		return true;
+	}
+
+	function get_total_results($type, $host) {
+		$headers = array(
+			"GET /feeds/$type/default?max-results=1&start-index=2 HTTP/1.0",
+			"Host: $host",
+			"Authorization: AuthSub token=\"$this->token\""
+		);
+		$request = join( "\r\n", $headers ) . "\r\n\r\n";
+		$sock = $this->_get_blogger_sock( $host );
+		if ( ! $sock ) return;
+		$response = $this->_txrx( $sock, $request );
+		$response = $this->parse_response( $response );
+		$parser = xml_parser_create();
+		xml_parse_into_struct($parser, $response['body'], $struct, $index);
+		xml_parser_free($parser);
+		$total_results = $struct[$index['OPENSEARCH:TOTALRESULTS'][0]]['value'];
+		return (int) $total_results;
+	}
+
+	function import_blog($blogID) {
+		global $importing_blog;
+		$importing_blog = $blogID;
+
+		if ( isset($_GET['authors']) )
+			return print($this->get_author_form());
+
+		header('Content-Type: text/plain');
+
+		if ( isset($_GET['status']) )
+			die($this->get_js_status());
+
+		if ( isset($_GET['saveauthors']) )
+			die($this->save_authors());
+
+		$blog = $this->blogs[$blogID];
+		$total_results = $this->get_total_results('posts', $blog['host']);
+		$this->blogs[$importing_blog]['total_posts'] = $total_results;
+
+		$start_index = $total_results - MAX_RESULTS + 1;
+
+		if ( isset( $this->blogs[$importing_blog]['posts_start_index'] ) )
+			$start_index = (int) $this->blogs[$importing_blog]['posts_start_index'];
+		elseif ( $total_results > MAX_RESULTS )
+			$start_index = $total_results - MAX_RESULTS + 1;
+		else
+			$start_index = 1;
+
+		// This will be positive until we have finished importing posts
+		if ( $start_index > 0 ) {
+			// Grab all the posts
+			$this->blogs[$importing_blog]['mode'] = 'posts';
+			$query = "start-index=$start_index&max-results=" . MAX_RESULTS;
+			do {
+				$index = $struct = $entries = array();
+				$headers = array(
+					"GET /feeds/posts/default?$query HTTP/1.0",
+					"Host: {$blog['host']}",
+					"Authorization: AuthSub token=\"$this->token\""
+				);
+				$request = join( "\r\n", $headers ) . "\r\n\r\n";
+				$sock = $this->_get_blogger_sock( $blog['host'] );
+				if ( ! $sock ) return; // TODO: Error handling
+				$response = $this->_txrx( $sock, $request );
+
+				$response = $this->parse_response( $response );
+
+				// Extract the entries and send for insertion
+				preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );
+				if ( count( $matches[0] ) ) {
+					$entries = array_reverse($matches[0]);
+					foreach ( $entries as $entry ) {
+						$entry = "<feed>$entry</feed>";
+						$AtomParser = new AtomParser();
+						$AtomParser->parse( $entry );
+						$result = $this->import_post($AtomParser->entry);
+						if ( is_wp_error( $result ) )
+							return $result;
+						unset($AtomParser);
+					}
+				} else break;
+
+				// Get the 'previous' query string which we'll use on the next iteration
+				$query = '';
+				$links = preg_match_all('/<link([^>]*)>/', $response['body'], $matches);
+				if ( count( $matches[1] ) )
+					foreach ( $matches[1] as $match )
+						if ( preg_match('/rel=.previous./', $match) )
+							$query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+
+				if ( $query ) {
+					parse_str($query, $q);
+					$this->blogs[$importing_blog]['posts_start_index'] = (int) $q['start-index'];
+				} else
+					$this->blogs[$importing_blog]['posts_start_index'] = 0;
+				$this->save_vars();
+			} while ( !empty( $query ) && $this->have_time() );
+		}
+
+		$total_results = $this->get_total_results( 'comments', $blog['host'] );
+		$this->blogs[$importing_blog]['total_comments'] = $total_results;
+
+		if ( isset( $this->blogs[$importing_blog]['comments_start_index'] ) )
+			$start_index = (int) $this->blogs[$importing_blog]['comments_start_index'];
+		elseif ( $total_results > MAX_RESULTS )
+			$start_index = $total_results - MAX_RESULTS + 1;
+		else
+			$start_index = 1;
+
+		if ( $start_index > 0 ) {
+			// Grab all the comments
+			$this->blogs[$importing_blog]['mode'] = 'comments';
+			$query = "start-index=$start_index&max-results=" . MAX_RESULTS;
+			do {
+				$index = $struct = $entries = array();
+				$headers = array(
+					"GET /feeds/comments/default?$query HTTP/1.0",
+					"Host: {$blog['host']}",
+					"Authorization: AuthSub token=\"$this->token\""
+				);
+				$request = join( "\r\n", $headers ) . "\r\n\r\n";
+				$sock = $this->_get_blogger_sock( $blog['host'] );
+				if ( ! $sock ) return; // TODO: Error handling
+				$response = $this->_txrx( $sock, $request );
+
+				$response = $this->parse_response( $response );
+
+				// Extract the comments and send for insertion
+				preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );
+				if ( count( $matches[0] ) ) {
+					$entries = array_reverse( $matches[0] );
+					foreach ( $entries as $entry ) {
+						$entry = "<feed>$entry</feed>";
+						$AtomParser = new AtomParser();
+						$AtomParser->parse( $entry );
+						$this->import_comment($AtomParser->entry);
+						unset($AtomParser);
+					}
+				}
+
+				// Get the 'previous' query string which we'll use on the next iteration
+				$query = '';
+				$links = preg_match_all('/<link([^>]*)>/', $response['body'], $matches);
+				if ( count( $matches[1] ) )
+					foreach ( $matches[1] as $match )
+						if ( preg_match('/rel=.previous./', $match) )
+							$query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+
+				parse_str($query, $q);
+
+				$this->blogs[$importing_blog]['comments_start_index'] = (int) $q['start-index'];
+				$this->save_vars();
+			} while ( !empty( $query ) && $this->have_time() );
+		}
+		$this->blogs[$importing_blog]['mode'] = 'authors';
+		$this->save_vars();
+		if ( !$this->blogs[$importing_blog]['posts_done'] && !$this->blogs[$importing_blog]['comments_done'] )
+			die('nothing');
+		do_action('import_done', 'blogger');
+		die('done');
+	}
+
+	function convert_date( $date ) {
+	    preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.[0-9]+)?(Z|[\+|\-][0-9]{2,4}){0,1}#', $date, $date_bits);
+	    $offset = iso8601_timezone_to_offset( $date_bits[7] );
+		$timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);
+		$timestamp -= $offset; // Convert from Blogger local time to GMT
+		$timestamp += get_option('gmt_offset') * 3600; // Convert from GMT to WP local time
+		return gmdate('Y-m-d H:i:s', $timestamp);
+	}
+
+	function no_apos( $string ) {
+		return str_replace( '&apos;', "'", $string);
+	}
+
+	function min_whitespace( $string ) {
+		return preg_replace( '|\s+|', ' ', $string );
+	}
+
+	function import_post( $entry ) {
+		global $importing_blog;
+
+		// The old permalink is all Blogger gives us to link comments to their posts.
+		if ( isset( $entry->draft ) )
+			$rel = 'self';
+		else
+			$rel = 'alternate';
+		foreach ( $entry->links as $link ) {
+			if ( $link['rel'] == $rel ) {
+				$parts = parse_url( $link['href'] );
+				$entry->old_permalink = $parts['path'];
+				break;
+			}
+		}
+
+		$post_date    = $this->convert_date( $entry->published );
+		$post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) );
+		$post_title   = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
+		$post_status  = isset( $entry->draft ) ? 'draft' : 'publish';
+
+		// Clean up content
+		$post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+		$post_content = str_replace('<br>', '<br />', $post_content);
+		$post_content = str_replace('<hr>', '<hr />', $post_content);
+
+		// Checks for duplicates
+		if ( isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ) {
+			++$this->blogs[$importing_blog]['posts_skipped'];
+		} elseif ( $post_id = post_exists( $post_title, $post_content, $post_date ) ) {
+			$this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id;
+			++$this->blogs[$importing_blog]['posts_skipped'];
+		} else {
+			$post = compact('post_date', 'post_content', 'post_title', 'post_status');
+
+			$post_id = wp_insert_post($post);
+			if ( is_wp_error( $post_id ) )
+				return $post_id;
+
+			wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id );
+
+			$author = $this->no_apos( strip_tags( $entry->author ) );
+
+			add_post_meta( $post_id, 'blogger_blog', $this->blogs[$importing_blog]['host'], true );
+			add_post_meta( $post_id, 'blogger_author', $author, true );
+			add_post_meta( $post_id, 'blogger_permalink', $entry->old_permalink, true );
+
+			$this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id;
+			++$this->blogs[$importing_blog]['posts_done'];
+		}
+		$this->save_vars();
+		return;
+	}
+
+	function import_comment( $entry ) {
+		global $importing_blog;
+
+		// Drop the #fragment and we have the comment's old post permalink.
+		foreach ( $entry->links as $link ) {
+			if ( $link['rel'] == 'alternate' ) {
+				$parts = parse_url( $link['href'] );
+				$entry->old_permalink = $parts['fragment'];
+				$entry->old_post_permalink = $parts['path'];
+				break;
+			}
+		}
+
+		$comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink];
+		preg_match('#<name>(.+?)</name>.*(?:\<uri>(.+?)</uri>)?#', $entry->author, $matches);
+		$comment_author  = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
+		$comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
+		$comment_date    = $this->convert_date( $entry->updated );
+		$comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) );
+
+		// Clean up content
+		$comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
+		$comment_content = str_replace('<br>', '<br />', $comment_content);
+		$comment_content = str_replace('<hr>', '<hr />', $comment_content);
+
+		// Checks for duplicates
+		if (
+			isset( $this->blogs[$importing_blog]['comments'][$entry->old_permalink] ) ||
+			comment_exists( $comment_author, $comment_date )
+		) {
+			++$this->blogs[$importing_blog]['comments_skipped'];
+		} else {
+			$comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content');
+
+			$comment_id = wp_insert_comment($comment);
+
+			$this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id;
+
+			++$this->blogs[$importing_blog]['comments_done'];
+		}
+		$this->save_vars();
+	}
+
+	function get_js_status($blog = false) {
+		global $importing_blog;
+		if ( $blog === false )
+			$blog = $this->blogs[$importing_blog];
+		else
+			$blog = $this->blogs[$blog];
+		$p1 = isset( $blog['posts_done'] ) ? (int) $blog['posts_done'] : 0;
+		$p2 = isset( $blog['total_posts'] ) ? (int) $blog['total_posts'] : 0;
+		$c1 = isset( $blog['comments_done'] ) ? (int) $blog['comments_done'] : 0;
+		$c2 = isset( $blog['total_comments'] ) ? (int) $blog['total_comments'] : 0;
+		return "{p1:$p1,p2:$p2,c1:$c1,c2:$c2}";
+	}
+
+	function get_author_form($blog = false) {
+		global $importing_blog, $wpdb, $current_user;
+		if ( $blog === false )
+			$blog = & $this->blogs[$importing_blog];
+		else
+			$blog = & $this->blogs[$blog];
+
+		if ( !isset( $blog['authors'] ) ) {
+			$post_ids = array_values($blog['posts']);
+			$authors = (array) $wpdb->get_col("SELECT DISTINCT meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN (" . join( ',', $post_ids ) . ")");
+			$blog['authors'] = array_map(null, $authors, array_fill(0, count($authors), $current_user->ID));
+			$this->save_vars();
+		}
+
+		$directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user\'s posts to a different WordPress user. You may <a href="users.php">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the "Restart" function below.');
+		$heading = __('Author mapping');
+		$blogtitle = "{$blog['title']} ({$blog['host']})";
+		$mapthis = __('Blogger username');
+		$tothis = __('WordPress login');
+		$submit = js_escape( __('Save Changes') );
+
+		foreach ( $blog['authors'] as $i => $author )
+			$rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>";
+
+		return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&amp;noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>";
+	}
+
+	function get_user_options($current) {
+		global $importer_users;
+		if ( ! isset( $importer_users ) )
+			$importer_users = (array) get_users_of_blog();
+
+		foreach ( $importer_users as $user ) {
+			$sel = ( $user->user_id == $current ) ? " selected='selected'" : '';
+			$options .= "<option value='$user->user_id'$sel>$user->display_name</option>";
+		}
+
+		return $options;
+	}
+
+	function save_authors() {
+		global $importing_blog, $wpdb;
+		$authors = (array) $_POST['authors'];
+
+		$host = $this->blogs[$importing_blog]['host'];
+
+		// Get an array of posts => authors
+		$post_ids = (array) $wpdb->get_col( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'blogger_blog' AND meta_value = %s", $host) );
+		$post_ids = join( ',', $post_ids );
+		$results = (array) $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN ($post_ids)");
+		foreach ( $results as $row )
+			$authors_posts[$row->post_id] = $row->meta_value;
+
+		foreach ( $authors as $author => $user_id ) {
+			$user_id = (int) $user_id;
+
+			// Skip authors that haven't been changed
+			if ( $user_id == $this->blogs[$importing_blog]['authors'][$author][1] )
+				continue;
+
+			// Get a list of the selected author's posts
+			$post_ids = (array) array_keys( $authors_posts, $this->blogs[$importing_blog]['authors'][$author][0] );
+			$post_ids = join( ',', $post_ids);
+
+			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE id IN ($post_ids)", $user_id) );
+			$this->blogs[$importing_blog]['authors'][$author][1] = $user_id;
+		}
+		$this->save_vars();
+
+		wp_redirect('edit.php');
+	}
+
+	function _get_auth_sock() {
+		// Connect to https://www.google.com
+		if ( !$sock = @ fsockopen('ssl://www.google.com', 443, $errno, $errstr) ) {
+			$this->uh_oh(
+				__('Could not connect to https://www.google.com'),
+				__('There was a problem opening a secure connection to Google. This is what went wrong:'),
+				"$errstr ($errno)"
+			);
+			return false;
+		}
+		return $sock;
+	}
+
+	function _get_blogger_sock($host = 'www2.blogger.com') {
+		if ( !$sock = @ fsockopen($host, 80, $errno, $errstr) ) {
+			$this->uh_oh(
+				sprintf( __('Could not connect to %s'), $host ),
+				__('There was a problem opening a connection to Blogger. This is what went wrong:'),
+				"$errstr ($errno)"
+			);
+			return false;
+		}
+		return $sock;
+	}
+
+	function _txrx( $sock, $request ) {
+		fwrite( $sock, $request );
+		while ( ! feof( $sock ) )
+			$response .= @ fread ( $sock, 8192 );
+		fclose( $sock );
+		return $response;
+	}
+
+	function revoke($token) {
+		$headers = array(
+			"GET /accounts/AuthSubRevokeToken HTTP/1.0",
+			"Authorization: AuthSub token=\"$token\""
+		);
+		$request = join( "\r\n", $headers ) . "\r\n\r\n";
+		$sock = $this->_get_auth_sock( );
+		if ( ! $sock ) return false;
+		$this->_txrx( $sock, $request );
+	}
+
+	function restart() {
+		global $wpdb;
+		$options = get_option( 'blogger_importer' );
+
+		if ( isset( $options['token'] ) )
+			$this->revoke( $options['token'] );
+
+		delete_option('blogger_importer');
+		$wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = 'blogger_author'");
+		wp_redirect('?import=blogger');
+	}
+
+	// Returns associative array of code, header, cookies, body. Based on code from php.net.
+	function parse_response($this_response) {
+		// Split response into header and body sections
+		list($response_headers, $response_body) = explode("\r\n\r\n", $this_response, 2);
+		$response_header_lines = explode("\r\n", $response_headers);
+
+		// First line of headers is the HTTP response code
+		$http_response_line = array_shift($response_header_lines);
+		if(preg_match('@^HTTP/[0-9]\.[0-9] ([0-9]{3})@',$http_response_line, $matches)) { $response_code = $matches[1]; }
+
+		// put the rest of the headers in an array
+		$response_header_array = array();
+		foreach($response_header_lines as $header_line) {
+			list($header,$value) = explode(': ', $header_line, 2);
+			$response_header_array[$header] .= $value."\n";
+		}
+
+		$cookie_array = array();
+		$cookies = explode("\n", $response_header_array["Set-Cookie"]);
+		foreach($cookies as $this_cookie) { array_push($cookie_array, "Cookie: ".$this_cookie); }
+
+		return array("code" => $response_code, "header" => $response_header_array, "cookies" => $cookie_array, "body" => $response_body);
+	}
+
+	// Step 9: Congratulate the user
+	function congrats() {
+		$blog = (int) $_GET['blog'];
+		echo '<h1>'.__('Congratulations!').'</h1><p>'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'</p><ul><li>'.__('That was hard work! Take a break.').'</li>';
+		if ( count($this->import['blogs']) > 1 )
+			echo '<li>'.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . '</li>';
+		if ( $n = count($this->import['blogs'][$blog]['newusers']) )
+			echo '<li>'.sprintf(__('Go to <a href="%s" target="%s">Authors &amp; Users</a>, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'</li>';
+		echo '<li>'.__('For security, click the link below to reset this importer.').'</li>';
+		echo '</ul>';
+	}
+
+	// Figures out what to do, then does it.
+	function start() {
+		if ( isset($_POST['restart']) )
+			$this->restart();
+
+		$options = get_option('blogger_importer');
+
+		if ( is_array($options) )
+			foreach ( $options as $key => $value )
+				$this->$key = $value;
+
+		if ( isset( $_REQUEST['blog'] ) ) {
+			$blog = is_array($_REQUEST['blog']) ? array_shift( $keys = array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog'];
+			$blog = (int) $blog;
+			$result = $this->import_blog( $blog );
+			if ( is_wp_error( $result ) )
+				echo $result->get_error_message();
+		} elseif ( isset($_GET['token']) )
+			$this->auth();
+		elseif ( isset($this->token) && $this->token_is_valid() )
+			$this->show_blogs();
+		else
+			$this->greet();
+
+		$saved = $this->save_vars();
+
+		if ( $saved && !isset($_GET['noheader']) ) {
+			$restart = __('Restart');
+			$message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.');
+			$submit = __('Clear account information');
+			echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&amp;noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>";
+		}
+	}
+
+	function save_vars() {
+		$vars = get_object_vars($this);
+		update_option( 'blogger_importer', $vars );
+
+		return !empty($vars);
+	}
+
+	function admin_head() {
+?>
+<style type="text/css">
+td { text-align: center; line-height: 2em;}
+thead td { font-weight: bold; }
+.bar {
+	width: 200px;
+	text-align: left;
+	line-height: 2em;
+	padding: 0px;
+}
+.ind {
+	position: absolute;
+	background-color: #83B4D8;
+	width: 1px;
+	z-index: 9;
+}
+.stat {
+	z-index: 10;
+	position: relative;
+	text-align: center;
+}
+</style>
+<?php
+	}
+
+	function Blogger_Import() {
+		global $importer_started;
+		$importer_started = time();
+		if ( isset( $_GET['import'] ) && $_GET['import'] == 'blogger' ) {
+			wp_enqueue_script('jquery');
+			add_action('admin_head', array(&$this, 'admin_head'));
+		}
+	}
+}
+
+$blogger_import = new Blogger_Import();
+
+register_importer('blogger', __('Blogger'), __('Import posts, comments, and users from a Blogger blog.'), array ($blogger_import, 'start'));
+
+class AtomEntry {
+	var $links = array();
+	var $categories = array();
+}
+
+class AtomParser {
+
+	var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
+	var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft','author');
+
+	var $depth = 0;
+	var $indent = 2;
+	var $in_content;
+	var $ns_contexts = array();
+	var $ns_decls = array();
+	var $is_xhtml = false;
+	var $skipped_div = false;
+
+	var $entry;
+
+	function AtomParser() {
+
+		$this->entry = new AtomEntry();
+		$this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
+		$this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
+	}
+
+	function parse($xml) {
+
+		global $app_logging;
+		array_unshift($this->ns_contexts, array());
+
+		$parser = xml_parser_create_ns();
+		xml_set_object($parser, $this);
+		xml_set_element_handler($parser, "start_element", "end_element");
+		xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
+		xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+		xml_set_character_data_handler($parser, "cdata");
+		xml_set_default_handler($parser, "_default");
+		xml_set_start_namespace_decl_handler($parser, "start_ns");
+		xml_set_end_namespace_decl_handler($parser, "end_ns");
+
+		$contents = "";
+
+		xml_parse($parser, $xml);
+
+		xml_parser_free($parser);
+
+		return true;
+	}
+
+	function start_element($parser, $name, $attrs) {
+
+		$tag = array_pop(split(":", $name));
+
+		array_unshift($this->ns_contexts, $this->ns_decls);
+
+		$this->depth++;
+
+		if(!empty($this->in_content)) {
+			$attrs_prefix = array();
+
+			// resolve prefixes for attributes
+			foreach($attrs as $key => $value) {
+				$attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value);
+			}
+			$attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
+			if(strlen($attrs_str) > 0) {
+				$attrs_str = " " . $attrs_str;
+			}
+
+			$xmlns_str = join(' ', array_map($this->map_xmlns_func, array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0])));
+			if(strlen($xmlns_str) > 0) {
+				$xmlns_str = " " . $xmlns_str;
+			}
+
+			// handle self-closing tags (case: a new child found right-away, no text node)
+			if(count($this->in_content) == 2) {
+				array_push($this->in_content, ">");
+			}
+
+			array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}");
+		} else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+			$this->in_content = array();
+			$this->is_xhtml = $attrs['type'] == 'xhtml';
+			array_push($this->in_content, array($tag,$this->depth));
+		} else if($tag == 'link') {
+			array_push($this->entry->links, $attrs);
+		} else if($tag == 'category') {
+			array_push($this->entry->categories, $attrs['term']);
+		}
+
+		$this->ns_decls = array();
+	}
+
+	function end_element($parser, $name) {
+
+		$tag = array_pop(split(":", $name));
+
+		if(!empty($this->in_content)) {
+			if($this->in_content[0][0] == $tag &&
+			$this->in_content[0][1] == $this->depth) {
+				array_shift($this->in_content);
+				if($this->is_xhtml) {
+					$this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3);
+				}
+				$this->entry->$tag = join('',$this->in_content);
+				$this->in_content = array();
+			} else {
+				$endtag = $this->ns_to_prefix($name);
+				if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) {
+					array_push($this->in_content, "/>");
+				} else {
+					array_push($this->in_content, "</$endtag>");
+				}
+			}
+		}
+
+		array_shift($this->ns_contexts);
+
+		#print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";
+
+		$this->depth--;
+	}
+
+	function start_ns($parser, $prefix, $uri) {
+		#print str_repeat(" ", $this->depth * $this->indent) . "starting: " . $prefix . ":" . $uri . "\n";
+		array_push($this->ns_decls, array($prefix,$uri));
+	}
+
+	function end_ns($parser, $prefix) {
+		#print str_repeat(" ", $this->depth * $this->indent) . "ending: #" . $prefix . "#\n";
+	}
+
+	function cdata($parser, $data) {
+		#print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n";
+		if(!empty($this->in_content)) {
+			// handle self-closing tags (case: text node found, need to close element started)
+			if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
+				array_push($this->in_content, ">");
+			}
+			array_push($this->in_content, $this->xml_escape($data));
+		}
+	}
+
+	function _default($parser, $data) {
+		# when does this gets called?
+	}
+
+
+	function ns_to_prefix($qname) {
+		$components = split(":", $qname);
+		$name = array_pop($components);
+
+		if(!empty($components)) {
+			$ns = join(":",$components);
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+						return "$mapping[0]:$name";
+					}
+				}
+			}
+		}
+		return $name;
+	}
+
+	function xml_escape($string)
+	{
+			 return str_replace(array('&','"',"'",'<','>'),
+				array('&amp;','&quot;','&apos;','&lt;','&gt;'),
+				$string );
+	}
+}
+
+?>
diff -uNr a/mp-wp/wp-admin/import/blogware.php b/mp-wp/wp-admin/import/blogware.php
--- a/mp-wp/wp-admin/import/blogware.php false
+++ b/mp-wp/wp-admin/import/blogware.php 215899a4bdd06858e9fc56643d867c70dfcfd95467439a88419c6a56ed19b9f906a10dd40bd32d297094e3eeed17e3d70c77719251df3a0ffe921017f333124d
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Blogware XML Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ * @author Shayne Sweeney
+ * @link http://www.theshayne.com/
+ */
+
+/**
+ * Blogware XML Importer class
+ *
+ * Extract posts from Blogware XML export file into your blog.
+ *
+ * @since unknown
+ */
+class BW_Import {
+
+	var $file;
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 <em>%s</em> already exists.'), stripslashes($post_title));
+			} else {
+				printf(__('Importing post <em>%s</em>...'), 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( __ngettext('%s comment', '%s comments', $num_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']);
+		do_action('import_done', 'blogware');
+		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'));
+?>
diff -uNr a/mp-wp/wp-admin/import/btt.php b/mp-wp/wp-admin/import/btt.php
--- a/mp-wp/wp-admin/import/btt.php false
+++ b/mp-wp/wp-admin/import/btt.php 157a7579d966b8160af5d42fb504acb4e959d2529a5f8b2a9187d5139b35109c0f3e0aca21ac88a82221c63627bdab15f04849fbfebf0faa8ad314e9a4098545
@@ -0,0 +1,130 @@
+<?php
+/**
+ * BunnyTags Plugin Tag Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * BunnyTags Plugin tag converter
+ *
+ * This will process the BunnyTags plugin tags and convert them to the WordPress
+ * 2.3 taxonomy.
+ *
+ * @since unknown
+ */
+class BunnyTags_Import {
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 Bunny&#8217;s Technorati Tags into WordPress tags.').'</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" class="button" value="'.__('Import Tags').'" /></p>';
+		echo '</form>';
+		echo '</div>';
+	}
+
+	function dispatch() {
+		if ( empty($_GET['step']) )
+			$step = 0;
+		else
+			$step = absint($_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( __ngettext('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $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" class="button" value="'.__('Next').'" /></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 WordPress tags.'), array($btt_import, 'dispatch'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/dotclear.php b/mp-wp/wp-admin/import/dotclear.php
--- a/mp-wp/wp-admin/import/dotclear.php false
+++ b/mp-wp/wp-admin/import/dotclear.php 9bcf079ec550633a2846cb4b8dba0cc6bd939e4e282ee64d5e4a38a3f478cab763722bd97e8ecc5452033b284a9d4592562e520639f3b4da00251dfbbfeef096
@@ -0,0 +1,835 @@
+<?php
+/**
+ * DotClear Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ * @author Thomas Quinot
+ * @link http://thomas.quinot.org/
+ */
+
+/**
+	Add These Functions to make our lives easier
+**/
+
+if(!function_exists('get_comment_count'))
+{
+	/**
+	 * Get the comment count for posts.
+	 *
+	 * @package WordPress
+	 * @subpackage Dotclear_Import
+	 *
+	 * @param int $post_ID Post ID
+	 * @return int
+	 */
+	function get_comment_count($post_ID)
+	{
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+	}
+}
+
+if(!function_exists('link_exists'))
+{
+	/**
+	 * Check whether link already exists.
+	 *
+	 * @package WordPress
+	 * @subpackage Dotclear_Import
+	 *
+	 * @param string $linkname
+	 * @return int
+	 */
+	function link_exists($linkname)
+	{
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $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
+//
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $char
+ * @return string
+ */
+function valid_1byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0x80) == 0x00;
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $char
+ * @return string
+ */
+function valid_2byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xE0) == 0xC0;
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $char
+ * @return string
+ */
+function valid_3byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xF0) == 0xE0;
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $char
+ * @return string
+ */
+function valid_4byte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xF8) == 0xF0;
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $char
+ * @return string
+ */
+function valid_nextbyte($char) {
+	if(!is_int($char)) return false;
+		return ($char & 0xC0) == 0x80;
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $string
+ * @return string
+ */
+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
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $s
+ * @return string
+ */
+function csc ($s) {
+	if (valid_utf8 ($s)) {
+		return $s;
+	} else {
+		return iconv(get_option ("dccharset"),"UTF-8",$s);
+	}
+}
+
+/**
+ * @package WordPress
+ * @subpackage Dotclear_Import
+ *
+ * @param string $s
+ * @return string
+ */
+function textconv ($s) {
+	return csc (preg_replace ('|(?<!<br />)\s*\n|', ' ', $s));
+}
+
+/**
+ * Dotclear Importer class
+ *
+ * Will process the WordPress eXtended RSS files that you upload from the export
+ * file.
+ *
+ * @package WordPress
+ * @subpackage Importer
+ *
+ * @since unknown
+ */
+class Dotclear_Import {
+
+	function header()
+	{
+		echo '<div class="wrap">';
+		screen_icon();
+		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" class="button" value="'.attribute_escape(__('Import Categories')).'" /></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(__ngettext('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $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(__ngettext('Done! <strong>%s</strong> link or link category imported.', 'Done! <strong>%s</strong> links or link categories imported.', $count), $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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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');
+		do_action('import_done', 'dotclear');
+		$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="form-table">';
+		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" id="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'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/greymatter.php b/mp-wp/wp-admin/import/greymatter.php
--- a/mp-wp/wp-admin/import/greymatter.php false
+++ b/mp-wp/wp-admin/import/greymatter.php f45f3c68986e47e93be96141a8b8db6c4a1354b19f75196dccf2d1b49331bf4665c0fba3e9b1c16ec7ee95e0ddd7117fb3d5d7c35589d2ad6fad1dc9597d5636
@@ -0,0 +1,334 @@
+<?php
+/**
+ * GreyMatter Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * GreyMatter Importer class
+ *
+ * Basic GreyMatter to WordPress importer, will import posts, comments, and
+ * posts karma.
+ *
+ * @since unknown
+ */
+class GM_Import {
+
+	var $gmnames = array ();
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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" action="">
+<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>
+<table class="form-table">
+<tr>
+<td><label for="gmpath"><?php _e('Path to GM files:') ?></label></td>
+<td><input type="text" style="width:300px" name="gmpath" id="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
+</tr>
+<tr>
+<td><label for="archivespath"><?php _e('Path to GM entries:') ?></label></td>
+<td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
+</tr>
+<tr>
+<td><label for="lastentry"><?php _e("Last entry's number:") ?></label></td>
+<td><input type="text" name="lastentry" id="lastentry" value="00000001" /><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>
+</table>
+<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Start Importing') ?>" /></p>
+</form>
+<?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( __ngettext('imported %s comment', 'imported %s comments', $numAddedComments) , $numAddedComments);
+				}
+				$preExisting = $numComments - numAddedComments;
+				if ($preExisting > 0) {
+					echo ' ';
+					printf( __ngettext( 'ignored %s pre-existing comment', 'ignored %s pre-existing comments', $preExisting ) , $preExisting);
+				}
+			}
+			echo '... <strong>'.__('Done').'</strong></li>';
+		}
+	}
+	do_action('import_done', 'greymatter');
+	?>
+</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'));
+?>
diff -uNr a/mp-wp/wp-admin/import/jkw.php b/mp-wp/wp-admin/import/jkw.php
--- a/mp-wp/wp-admin/import/jkw.php false
+++ b/mp-wp/wp-admin/import/jkw.php c8a75bf7f66d82a5103fd28cc587ba172dda2913daa728c7afea256566dc277c809db7b7854beee0011abcda06313658f8c8f3d0704690e700a4f71d91f41f2d
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Jeromes Keyword Plugin Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * Jeromes Keyword Plugin Importer class
+ *
+ * Will convert Jeromes Keyword Plugin tags to WordPress taxonomy tags.
+ *
+ * @since 2.3
+ */
+class JeromesKeyword_Import {
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 Jerome&#8217;s Keywords into WordPress tags.').'</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" class="button" value="'.__('Import Version 1.x').'" /></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" class="button" value="'.__('Import Version 2.0a').'" /></p>';
+		echo '</form>';
+		echo '</div>';
+	}
+
+	function dispatch() {
+		if ( empty($_GET['step']) )
+			$step = 0;
+		else
+			$step = absint($_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( __ngettext('Done! <strong>%s</strong> post with tags were read.', 'Done! <strong>%s</strong> posts with tags were read.', $count), $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" class="button" value="'.__('Next').'" /></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( __ngettext('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $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" class="button" value="'.__('Next').'" /></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 WordPress tags.'), array($jkw_import, 'dispatch'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/livejournal.php b/mp-wp/wp-admin/import/livejournal.php
--- a/mp-wp/wp-admin/import/livejournal.php false
+++ b/mp-wp/wp-admin/import/livejournal.php aebae525e0a662a64f5de26803d85d29d63b7a1864f5ecb3d16c5bdf560aefb0c927c051d0916e8fe288f3dc23e27f955790f8fee9b4cc441d3abedb3f751d6c
@@ -0,0 +1,193 @@
+<?php
+/**
+ * LiveJournal Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * LiveJournal Importer class
+ *
+ * Imports your LiveJournal XML exported file into WordPress.
+ *
+ * @since unknown
+ */
+class LJ_Import {
+
+	var $file;
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 <em>%s</em> already exists.'), stripslashes($post_title));
+			} else {
+				printf(__('Importing post <em>%s</em>...'), 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(__ngettext('(%s comment)', '(%s comments)', $num_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']);
+		do_action('import_done', 'livejournal');
+
+		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'));
+?>
diff -uNr a/mp-wp/wp-admin/import/mt.php b/mp-wp/wp-admin/import/mt.php
--- a/mp-wp/wp-admin/import/mt.php false
+++ b/mp-wp/wp-admin/import/mt.php 3b5df893bd2ec915e46237523169c3269ae2d414bad0c77bd78e380882a7cfe08a399ae86988c1a6db618810fe2a59039e9128ca98b6060f6708a1302a8c9ab6
@@ -0,0 +1,512 @@
+<?php
+/**
+ * Movable Type and Typepad Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * Moveable Type and Typepad Importer class
+ *
+ * Upload your exported Movable Type or Typepad entries into WordPress.
+ *
+ * @since unknown
+ */
+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">';
+		screen_icon();
+		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" class="button" value="<?php echo attribute_escape(__('Import mt-export.txt')); ?>" />
+</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;
+		$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 has_gzip() {
+		return is_callable('gzopen');
+	}
+
+	function fopen($filename, $mode='r') {
+		if ( $this->has_gzip() )
+			return gzopen($filename, $mode);
+		return fopen($filename, $mode);
+	}
+
+	function feof($fp) {
+		if ( $this->has_gzip() )
+			return gzeof($fp);
+		return feof($fp);
+	}
+
+	function fgets($fp, $len=8192) {
+		if ( $this->has_gzip() )
+			return gzgets($fp, $len);
+		return fgets($fp, $len);
+	}
+
+	function fclose($fp) {
+		if ( $this->has_gzip() )
+			return gzclose($fp);
+		return fclose($fp);
+ 	}
+
+	//function to check the authorname and do the mapping
+	function checkauthor($author) {
+		//mtnames is an array with the names in the mt import file
+		$pass = wp_generate_password();
+		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_mt_authors() {
+		$temp = array();
+		$authors = array();
+
+		$handle = $this->fopen($this->file, 'r');
+		if ( $handle == null )
+			return false;
+
+		$in_comment = false;
+		while ( $line = $this->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");
+		}
+
+		$this->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">
+<?php screen_icon(); ?>
+<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 <em>italics</em>. 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, a password will be randomly generated. Manually change the user\'s details if necessary.'); ?></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><label>'.__('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 '</label></li>';
+		}
+
+		echo '<p class="submit"><input type="submit" class="button" value="'.__('Submit').'"></p>'.'<br />';
+		echo '</form>';
+		echo '</ol></div>';
+
+	}
+
+	function select_authors() {
+		if ( $_POST['upload_type'] === 'ftp' ) {
+			$file['file'] = WP_CONTENT_DIR . '/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 <em>%s</em> already exists.'), stripslashes($post->post_title));
+		} else {
+			echo '<li>';
+			printf(__('Importing post <em>%s</em>...'), 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);
+			}
+
+			 // Add tags or keywords
+			if ( 1 < strlen($post->post_keywords) ) {
+			 	// Keywords exist.
+				printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords));
+				wp_add_post_tags($post_id, $post->post_keywords);
+			}
+		}
+
+		$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(' '.__ngettext('(%s comment)', '(%s comments)', $num_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(' '.__ngettext('(%s ping)', '(%s pings)', $num_pings), $num_pings);
+
+		echo "</li>";
+		//ob_flush();flush();
+	}
+
+	function process_posts() {
+		global $wpdb;
+
+		$handle = $this->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 = $this->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( strtolower( 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 ( 'keywords' == $context ) {
+					$post->post_keywords .= $line;
+				} else if ( 'comment' == $context ) {
+					$comment->comment_content .= $line;
+				} else if ( 'ping' == $context ) {
+					$ping->comment_content .= $line;
+				}
+			}
+		}
+
+		$this->fclose($handle);
+
+		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 = WP_CONTENT_DIR . '/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'));
+?>
diff -uNr a/mp-wp/wp-admin/import/opml.php b/mp-wp/wp-admin/import/opml.php
--- a/mp-wp/wp-admin/import/opml.php false
+++ b/mp-wp/wp-admin/import/opml.php 9bcdeec7b98a1d38da2c4d7a070951dbc2c7bf4daf939e26048a7275bfefb566419ecb0a8565c366c7efaee7fef0eb26e05cdf13279f76a5284a8b892f50f55b
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Links Import Administration Panel.
+ *
+ * @copyright 2002 Mike Little <mike@zed1.com>
+ * @author Mike Little <mike@zed1.com>
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Administration Bootstrap */
+$parent_file = 'tools.php';
+$submenu_file = 'import.php';
+$title = __('Import Blogroll');
+
+class OPML_Import {
+
+	function dispatch() {
+		global $wpdb, $user_ID;
+$step = $_POST['step'];
+if (!$step) $step = 0;
+?>
+<?php
+switch ($step) {
+	case 0: {
+		include_once('admin-header.php');
+		if ( !current_user_can('manage_links') )
+			wp_die(__('Cheatin&#8217; uh?'));
+
+		$opmltype = 'blogrolling'; // default.
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e('Import your blogroll from another system') ?> </h2>
+<form enctype="multipart/form-data" action="admin.php?import=opml" method="post" name="blogroll">
+<?php wp_nonce_field('import-bookmarks') ?>
+
+<p><?php _e('If a program or website you use allows you to export your links or subscriptions as OPML you may import them here.'); ?></p>
+<div style="width: 70%; margin: auto; height: 8em;">
+<input type="hidden" name="step" value="1" />
+<input type="hidden" name="MAX_FILE_SIZE" value="30000" />
+<div style="width: 48%;" class="alignleft">
+<h3><label for="opml_url"><?php _e('Specify an OPML URL:'); ?></label></h3>
+<input type="text" name="opml_url" id="opml_url" size="50" style="width: 90%;" value="http://" />
+</div>
+
+<div style="width: 48%;" class="alignleft">
+<h3><label for="userfile"><?php _e('Or choose from your local disk:'); ?></label></h3>
+<input id="userfile" name="userfile" type="file" size="30" />
+</div>
+
+</div>
+
+<p style="clear: both; margin-top: 1em;"><label for="cat_id"><?php _e('Now select a category you want to put these links in.') ?></label><br />
+<?php _e('Category:') ?> <select name="cat_id" id="cat_id">
+<?php
+$categories = get_terms('link_category', 'get=all');
+foreach ($categories as $category) {
+?>
+<option value="<?php echo $category->term_id; ?>"><?php echo wp_specialchars(apply_filters('link_category', $category->name)); ?></option>
+<?php
+} // end foreach
+?>
+</select></p>
+
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File') ?>" /></p>
+</form>
+
+</div>
+<?php
+		break;
+	} // end case 0
+
+	case 1: {
+		check_admin_referer('import-bookmarks');
+
+		include_once('admin-header.php');
+		if ( !current_user_can('manage_links') )
+			wp_die(__('Cheatin&#8217; uh?'));
+?>
+<div class="wrap">
+
+<h2><?php _e('Importing...') ?></h2>
+<?php
+		$cat_id = abs( (int) $_POST['cat_id'] );
+		if ( $cat_id < 1 )
+			$cat_id  = 1;
+
+		$opml_url = $_POST['opml_url'];
+		if ( isset($opml_url) && $opml_url != '' && $opml_url != 'http://' ) {
+			$blogrolling = true;
+		} else { // try to get the upload file.
+			$overrides = array('test_form' => false, 'test_type' => false);
+			$file = wp_handle_upload($_FILES['userfile'], $overrides);
+
+			if ( isset($file['error']) )
+				wp_die($file['error']);
+
+			$url = $file['url'];
+			$opml_url = $file['file'];
+			$blogrolling = false;
+		}
+
+		global $opml, $updated_timestamp, $all_links, $map, $names, $urls, $targets, $descriptions, $feeds;
+		if ( isset($opml_url) && $opml_url != '' ) {
+			if ( $blogrolling === true ) {
+				$opml = wp_remote_fopen($opml_url);
+			} else {
+				$opml = file_get_contents($opml_url);
+			}
+
+			/** Load OPML Parser */
+			include_once('link-parse-opml.php');
+
+			$link_count = count($names);
+			for ( $i = 0; $i < $link_count; $i++ ) {
+				if ('Last' == substr($titles[$i], 0, 4))
+					$titles[$i] = '';
+				if ( 'http' == substr($titles[$i], 0, 4) )
+					$titles[$i] = '';
+				$link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+				wp_insert_link($link);
+				echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+			}
+?>
+
+<p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+
+<?php
+} // end if got url
+else
+{
+	echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
+} // end else
+
+if ( ! $blogrolling )
+	do_action( 'wp_delete_file', $opml_url);
+	@unlink($opml_url);
+?>
+</div>
+<?php
+		break;
+	} // end case 1
+} // end switch
+	}
+
+	function OPML_Import() {}
+}
+
+$opml_importer = new OPML_Import();
+
+register_importer('opml', __('Blogroll'), __('Import links in OPML format.'), array(&$opml_importer, 'dispatch'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/rss.php b/mp-wp/wp-admin/import/rss.php
--- a/mp-wp/wp-admin/import/rss.php false
+++ b/mp-wp/wp-admin/import/rss.php 932fdf7b823f34069393e54b3e58c67f17bc4b5ed208df60d56a64e6e08792cda1cbeba1f42c2bc140421e05e8412d2e71ef6a70a4375e6e9fc03db49d1c8591
@@ -0,0 +1,198 @@
+<?php
+/**
+ * RSS Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * RSS Importer
+ *
+ * Will process a RSS feed for importing posts into WordPress. This is a very
+ * limited importer and should only be used as the last resort, when no other
+ * importer is available.
+ *
+ * @since unknown
+ */
+class RSS_Import {
+
+	var $posts = array ();
+	var $file;
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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']);
+		do_action('import_done', 'rss');
+
+		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'));
+?>
diff -uNr a/mp-wp/wp-admin/import/stp.php b/mp-wp/wp-admin/import/stp.php
--- a/mp-wp/wp-admin/import/stp.php false
+++ b/mp-wp/wp-admin/import/stp.php 51989c23b4307626271434576cc48791fbe75f002bf3ca0f1fc0a4b6c7db4752ba7d01b971f148e6b307b3d66a90113f3c0ef10ad6219d10cda58d87ceecbdcc
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Simple Tags Plugin Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * Simple Tags Plugin Tags converter class.
+ *
+ * Will convert Simple Tags Plugin tags over to the WordPress 2.3 taxonomy.
+ *
+ * @since unknown
+ */
+class STP_Import {
+	function header()  {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 Simple Tagging 1.6.2 into WordPress tags.').'</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" class="button" value="'.__('Step 1').'" /></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( __ngettext('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $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" class="button" value="'.__('Step 2').'" /></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( __ngettext('Done! <strong>%s</strong> tag was added!', 'Done! <strong>%s</strong> tags were added!', $tags_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" class="button" value="'.__('Step 3').'" /></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 WordPress tags.'), array($stp_import, 'dispatch'));
+?>
diff -uNr a/mp-wp/wp-admin/import/textpattern.php b/mp-wp/wp-admin/import/textpattern.php
--- a/mp-wp/wp-admin/import/textpattern.php false
+++ b/mp-wp/wp-admin/import/textpattern.php c57be38c164f3fa4ddd78683d82fae14230a83e4a3d571c83f53689c447eedd0aca7c9d97c1c67eff7fe9da868ed0d7148457caf5eafb2357fd973732b153058
@@ -0,0 +1,700 @@
+<?php
+/**
+ * TextPattern Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+if(!function_exists('get_comment_count'))
+{
+	/**
+	 * Get the comment count for posts.
+	 *
+	 * @package WordPress
+	 * @subpackage Textpattern_Import
+	 *
+	 * @param int $post_ID Post ID
+	 * @return int
+	 */
+	function get_comment_count($post_ID)
+	{
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+	}
+}
+
+if(!function_exists('link_exists'))
+{
+	/**
+	 * Check whether link already exists.
+	 *
+	 * @package WordPress
+	 * @subpackage Textpattern_Import
+	 *
+	 * @param string $linkname
+	 * @return int
+	 */
+	function link_exists($linkname)
+	{
+		global $wpdb;
+		return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $linkname) );
+	}
+}
+
+/**
+ * TextPattern Importer Class
+ *
+ * @since unknown
+ */
+class Textpattern_Import {
+
+	function header()
+	{
+		echo '<div class="wrap">';
+		screen_icon();
+		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" class="button" value="'.attribute_escape(__('Import')).'" /></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(__ngettext('Done! <strong>%1$s</strong> category imported.', 'Done! <strong>%1$s</strong> categories imported.', $count), $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 = $category2->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(__ngettext('Done! <strong>%s</strong> link imported', 'Done! <strong>%s</strong> links imported', $count), $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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', 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');
+		do_action('import_done', 'textpattern');
+		$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="form-table">';
+		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'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/utw.php b/mp-wp/wp-admin/import/utw.php
--- a/mp-wp/wp-admin/import/utw.php false
+++ b/mp-wp/wp-admin/import/utw.php 2f7da06f4950ffd6e9f4d9c52a85e13a98d408c69caf3545ca1ced021aa9249d717e86aada55ebfc09c0ab5ec21451886f8462e85536093ab515b22e2c602018
@@ -0,0 +1,290 @@
+<?php
+/**
+ * The Ultimate Tag Warrior Importer.
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * Ultimate Tag Warrior Converter to 2.3 taxonomy.
+ *
+ * This converts the Ultimate Tag Warrior tags to the 2.3 WordPress taxonomy.
+ *
+ * @since 2.3.0
+ */
+class UTW_Import {
+
+	function header()  {
+		echo '<div class="wrap">';
+		screen_icon();
+		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 Ultimate Tag Warrior 3 into WordPress tags.').'</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" class="button" value="'.__('Step 1').'" /></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( __ngettext('Done! <strong>%s</strong> tag were read.', 'Done! <strong>%s</strong> tags were read.', $count), $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" class="button" value="'.__('Step 2').'" /></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( __ngettext('Done! <strong>%s</strong> tag to post relationships were read.', 'Done! <strong>%s</strong> tags to post relationships were read.', $count), $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" class="button" value="'.__('Step 3').'" /></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( __ngettext( 'Done! <strong>%s</strong> tag were added!', 'Done! <strong>%s</strong> tags were added!', $tags_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" class="button" value="'.__('Step 4').'" /></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 WordPress tags.'), array($utw_import, 'dispatch'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/wordpress.php b/mp-wp/wp-admin/import/wordpress.php
--- a/mp-wp/wp-admin/import/wordpress.php false
+++ b/mp-wp/wp-admin/import/wordpress.php efae5b996de32533fa30deca52c2bd9912e8c34ec533abcebf2ae77fdca06740df26baf51dc54ec2b9f44a787936262047ac7750643fa60f30233f13bc774633
@@ -0,0 +1,806 @@
+<?php
+/**
+ * WordPress Importer
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * WordPress Importer
+ *
+ * Will process the WordPress eXtended RSS files that you upload from the export
+ * file.
+ *
+ * @since unknown
+ */
+class WP_Import {
+
+	var $post_ids_processed = array ();
+	var $orphans = array ();
+	var $file;
+	var $id;
+	var $mtnames = array ();
+	var $newauthornames = array ();
+	var $allauthornames = array ();
+
+	var $author_ids = array ();
+	var $tags = array ();
+	var $categories = array ();
+
+	var $j = -1;
+	var $fetch_attachments = false;
+	var $url_remap = array ();
+
+	function header() {
+		echo '<div class="wrap">';
+		screen_icon();
+		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, pages, comments, custom fields, categories, and tags 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 has_gzip() {
+		return is_callable('gzopen');
+	}
+
+	function fopen($filename, $mode='r') {
+		if ( $this->has_gzip() )
+			return gzopen($filename, $mode);
+		return fopen($filename, $mode);
+	}
+
+	function feof($fp) {
+		if ( $this->has_gzip() )
+			return gzeof($fp);
+		return feof($fp);
+	}
+
+	function fgets($fp, $len=8192) {
+		if ( $this->has_gzip() )
+			return gzgets($fp, $len);
+		return fgets($fp, $len);
+	}
+
+	function fclose($fp) {
+		if ( $this->has_gzip() )
+			return gzclose($fp);
+		return fclose($fp);
+	}
+
+	function get_entries($process_post_func=NULL) {
+		set_magic_quotes_runtime(0);
+
+		$doing_entry = false;
+		$is_wxr_file = false;
+
+		$fp = $this->fopen($this->file, 'r');
+		if ($fp) {
+			while ( !$this->feof($fp) ) {
+				$importline = rtrim($this->fgets($fp));
+
+				// this doesn't check that the file is perfectly valid but will at least confirm that it's not the wrong format altogether
+				if ( !$is_wxr_file && preg_match('|xmlns:wp="http://wordpress[.]org/export/\d+[.]\d+/"|', $importline) )
+					$is_wxr_file = true;
+
+				if ( false !== strpos($importline, '<wp:base_site_url>') ) {
+					preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url);
+					$this->base_url = $url[1];
+					continue;
+				}
+				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->post = '';
+					$doing_entry = true;
+					continue;
+				}
+				if ( false !== strpos($importline, '</item>') ) {
+					$doing_entry = false;
+					if ($process_post_func)
+						call_user_func($process_post_func, $this->post);
+					continue;
+				}
+				if ( $doing_entry ) {
+					$this->post .= $importline . "\n";
+				}
+			}
+
+			$this->fclose($fp);
+		}
+
+		return $is_wxr_file;
+
+	}
+
+	function get_wp_authors() {
+		// 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.
+		$temp = $this->allauthornames;
+		$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() {
+		global $current_user;
+
+		// this will populate $this->author_ids with a list of author_names => user_ids
+
+		foreach ( $_POST['author_in'] as $i => $in_author_name ) {
+
+			if ( !empty($_POST['user_select'][$i]) ) {
+				// an existing user was selected in the dropdown list
+				$user = get_userdata( intval($_POST['user_select'][$i]) );
+				if ( isset($user->ID) )
+					$this->author_ids[$in_author_name] = $user->ID;
+			}
+			elseif ( $this->allow_create_users() ) {
+				// nothing was selected in the dropdown list, so we'll use the name in the text field
+
+				$new_author_name = trim($_POST['user_create'][$i]);
+				// if the user didn't enter a name, assume they want to use the same name as in the import file
+				if ( empty($new_author_name) )
+					$new_author_name = $in_author_name;
+
+				$user_id = username_exists($new_author_name);
+				if ( !$user_id ) {
+					$user_id = wp_create_user($new_author_name, wp_generate_password());
+				}
+
+				$this->author_ids[$in_author_name] = $user_id;
+			}
+
+			// failsafe: if the user_id was invalid, default to the current user
+			if ( empty($this->author_ids[$in_author_name]) ) {
+				$this->author_ids[$in_author_name] = intval($current_user->ID);
+			}
+		}
+
+	}
+
+	function wp_authors_form() {
+?>
+<?php screen_icon(); ?>
+<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>
+<?php
+	if ( $this->allow_create_users() ) {
+		echo '<p>'.__('If a new user is created by WordPress, a password will be randomly generated. Manually change the user\'s details if necessary.')."</p>\n";
+	}
+
+
+		$authors = $this->get_wp_authors();
+		echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">';
+		wp_nonce_field('import-wordpress');
+		echo '<ol id="authors">';
+		$j = -1;
+		foreach ($authors as $author) {
+			++ $j;
+			echo '<li>'.__('Import author:').' <strong>'.$author.'</strong><br />';
+			$this->users_form($j, $author);
+			echo '</li>';
+		}
+
+		if ( $this->allow_fetch_attachments() ) {
+?>
+</ol>
+<?php screen_icon(); ?>
+<h2><?php _e('Import Attachments'); ?></h2>
+<p>
+	<input type="checkbox" value="1" name="attachments" id="import-attachments" />
+	<label for="import-attachments"><?php _e('Download and import file attachments') ?></label>
+</p>
+
+<?php
+		}
+
+		echo '<p class="submit">';
+		echo '<input type="submit" class="button" value="'.attribute_escape( __('Submit') ).'" />'.'<br />';
+		echo '</p>';
+		echo '</form>';
+
+	}
+
+	function users_form($n, $author) {
+
+		if ( $this->allow_create_users() ) {
+			printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30" /></label> <br />');
+		}
+		else {
+			echo __('Map to existing').'<br />';
+		}
+
+		// keep track of $n => $author name
+		echo '<input type="hidden" name="author_in['.intval($n).']" value="'.htmlspecialchars($author).'" />';
+
+		$users = get_users_of_blog();
+?><select name="user_select[<?php echo $n; ?>]">
+	<option value="0"><?php _e('- Select -'); ?></option>
+	<?php
+		foreach ($users as $user) {
+			echo '<option value="'.$user->user_id.'">'.$user->user_login.'</option>';
+		}
+?>
+	</select>
+	<?php
+	}
+
+	function select_authors() {
+		$is_wxr_file = $this->get_entries(array(&$this, 'process_author'));
+		if ( $is_wxr_file ) {
+			$this->wp_authors_form();
+		}
+		else {
+			echo '<h2>'.__('Invalid file').'</h2>';
+			echo '<p>'.__('Please upload a valid WXR (WordPress eXtended RSS) export file.').'</p>';
+		}
+	}
+
+	// fetch the user ID for a given author name, respecting the mapping preferences
+	function checkauthor($author) {
+		global $current_user;
+
+		if ( !empty($this->author_ids[$author]) )
+			return $this->author_ids[$author];
+
+		// failsafe: map to the current user
+		return $current_user->ID;
+	}
+
+
+
+	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_author($post) {
+		$author = $this->get_tag( $post, 'dc:creator' );
+		if ($author)
+			$this->allauthornames[] = $author;
+	}
+
+	function process_posts() {
+		echo '<ol>';
+
+		$this->get_entries(array(&$this, 'process_post'));
+
+		echo '</ol>';
+
+		wp_import_cleanup($this->id);
+		do_action('import_done', 'wordpress');
+
+		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->post_ids_processed[$post_ID]) ) // Processed already
+			return 0;
+
+		set_time_limit( 60 );
+
+		// 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' );
+		$post_password  = $this->get_tag( $post, 'wp:post_password' );
+		$guid           = $this->get_tag( $post, 'guid' );
+		$post_author    = $this->get_tag( $post, 'dc:creator' );
+
+		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
+		$post_excerpt = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_excerpt);
+		$post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
+		$post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
+
+		$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++;
+		}
+
+		$post_exists = post_exists($post_title, '', $post_date);
+
+		if ( $post_exists ) {
+			echo '<li>';
+			printf(__('Post <em>%s</em> already exists.'), stripslashes($post_title));
+			$comment_post_ID = $post_id = $post_exists;
+		} else {
+
+			// If it has parent, process parent first.
+			$post_parent = (int) $post_parent;
+			if ($post_parent) {
+				// if we already know the parent, map it to the local ID
+				if ( $parent = $this->post_ids_processed[$post_parent] ) {
+					$post_parent = $parent;  // new ID of the parent
+				}
+				else {
+					// record the parent for later
+					$this->orphans[intval($post_ID)] = $post_parent;
+				}
+			}
+
+			echo '<li>';
+
+			$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_excerpt', 'post_title', 'post_status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password');
+			$postdata['import_id'] = $post_ID;
+			if ($post_type == 'attachment') {
+				$remote_url = $this->get_tag( $post, 'wp:attachment_url' );
+				if ( !$remote_url )
+					$remote_url = $guid;
+
+				$comment_post_ID = $post_id = $this->process_attachment($postdata, $remote_url);
+				if ( !$post_id or is_wp_error($post_id) )
+					return $post_id;
+			}
+			else {
+				printf(__('Importing post <em>%s</em>...'), stripslashes($post_title));
+				$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->post_ids_processed[intval($post_ID)] = intval($post_id);
+			}
+
+			// Add categories.
+			if (count($categories) > 0) {
+				$post_cats = array();
+				foreach ($categories as $category) {
+					if ( '' == $category )
+						continue;
+					$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));
+						if ( is_wp_error($cat_ID) )
+							continue;
+					}
+					$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) {
+					if ( '' == $tag )
+						continue;
+					$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');
+						if ( is_wp_error($tag_id) )
+							continue;
+						$tag_id = $tag_id['term_id'];
+					}
+					$post_tags[] = intval($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 this is a new post we can skip the comment_exists() check
+			if ( !$post_exists || !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(' '.__ngettext('(%s comment)', '(%s comments)', $num_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.
+
+			$this->process_post_meta($post_id, $key, $value);
+
+		} }
+
+		do_action('import_post_added', $post_id);
+		print "</li>\n";
+	}
+
+	function process_post_meta($post_id, $key, $value) {
+		// the filter can return false to skip a particular metadata key
+		$_key = apply_filters('import_post_meta_key', $key);
+		if ( $_key ) {
+			add_post_meta( $post_id, $_key, $value );
+			do_action('import_post_meta', $post_id, $_key, $value);
+		}
+	}
+
+	function process_attachment($postdata, $remote_url) {
+		if ($this->fetch_attachments and $remote_url) {
+			printf( __('Importing attachment <em>%s</em>... '), htmlspecialchars($remote_url) );
+
+			// If the URL is absolute, but does not contain http, upload it assuming the base_site_url variable
+			if ( preg_match('/^\/[\w\W]+$/', $remote_url) )
+				$remote_url = rtrim($this->base_url,'/').$remote_url;
+
+			$upload = $this->fetch_remote_file($postdata, $remote_url);
+			if ( is_wp_error($upload) ) {
+				printf( __('Remote file error: %s'), htmlspecialchars($upload->get_error_message()) );
+				return $upload;
+			}
+			else {
+				print '('.size_format(filesize($upload['file'])).')';
+			}
+
+			if ( $info = wp_check_filetype($upload['file']) ) {
+				$postdata['post_mime_type'] = $info['type'];
+			}
+			else {
+				print __('Invalid file type');
+				return;
+			}
+
+			$postdata['guid'] = $upload['url'];
+
+			// as per wp-admin/includes/upload.php
+			$post_id = wp_insert_attachment($postdata, $upload['file']);
+			wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
+
+			// remap the thumbnail url.  this isn't perfect because we're just guessing the original url.
+			if ( preg_match('@^image/@', $info['type']) && $thumb_url = wp_get_attachment_thumb_url($post_id) ) {
+				$parts = pathinfo($remote_url);
+				$ext = $parts['extension'];
+				$name = basename($parts['basename'], ".{$ext}");
+				$this->url_remap[$parts['dirname'] . '/' . $name . '.thumbnail.' . $ext] = $thumb_url;
+			}
+
+			return $post_id;
+		}
+		else {
+			printf( __('Skipping attachment <em>%s</em>'), htmlspecialchars($remote_url) );
+		}
+	}
+
+	function fetch_remote_file($post, $url) {
+		$upload = wp_upload_dir($post['post_date']);
+
+		// extract the file name and extension from the url
+		$file_name = basename($url);
+
+		// get placeholder file in the upload dir with a unique sanitized filename
+		$upload = wp_upload_bits( $file_name, 0, '', $post['post_date']);
+		if ( $upload['error'] ) {
+			echo $upload['error'];
+			return new WP_Error( 'upload_dir_error', $upload['error'] );
+		}
+
+		// fetch the remote url and write it to the placeholder file
+		$headers = wp_get_http($url, $upload['file']);
+
+		//Request failed
+		if ( ! $headers ) {
+			@unlink($upload['file']);
+			return new WP_Error( 'import_file_error', __('Remote server did not respond') );
+		}
+
+		// make sure the fetch was successful
+		if ( $headers['response'] != '200' ) {
+			@unlink($upload['file']);
+			return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %1$d %2$s'), $headers['response'], get_status_header_desc($headers['response']) ) );
+		}
+		elseif ( isset($headers['content-length']) && filesize($upload['file']) != $headers['content-length'] ) {
+			@unlink($upload['file']);
+			return new WP_Error( 'import_file_error', __('Remote file is incorrect size') );
+		}
+
+		$max_size = $this->max_attachment_size();
+		if ( !empty($max_size) and filesize($upload['file']) > $max_size ) {
+			@unlink($upload['file']);
+			return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', size_format($max_size))) );
+		}
+
+		// keep track of the old and new urls so we can substitute them later
+		$this->url_remap[$url] = $upload['url'];
+		// if the remote url is redirected somewhere else, keep track of the destination too
+		if ( $headers['x-final-location'] != $url )
+			$this->url_remap[$headers['x-final-location']] = $upload['url'];
+
+		return $upload;
+
+	}
+
+	// sort by strlen, longest string first
+	function cmpr_strlen($a, $b) {
+		return strlen($b) - strlen($a);
+	}
+
+	// update url references in post bodies to point to the new local files
+	function backfill_attachment_urls() {
+
+		// make sure we do the longest urls first, in case one is a substring of another
+		uksort($this->url_remap, array(&$this, 'cmpr_strlen'));
+
+		global $wpdb;
+		foreach ($this->url_remap as $from_url => $to_url) {
+			// remap urls in post_content
+			$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, '%s', '%s')", $from_url, $to_url) );
+			// remap enclosure urls
+			$result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, '%s', '%s') WHERE meta_key='enclosure'", $from_url, $to_url) );
+		}
+	}
+
+	// update the post_parent of orphans now that we know the local id's of all parents
+	function backfill_parents() {
+		global $wpdb;
+
+		foreach ($this->orphans as $child_id => $parent_id) {
+			$local_child_id = $this->post_ids_processed[$child_id];
+			$local_parent_id = $this->post_ids_processed[$parent_id];
+			if ($local_child_id and $local_parent_id) {
+				$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_parent = %d WHERE ID = %d", $local_parent_id, $local_child_id));
+			}
+		}
+	}
+
+	function is_valid_meta_key($key) {
+		// skip _wp_attached_file metadata since we'll regenerate it from scratch
+		if ( $key == '_wp_attached_file' )
+			return false;
+		return $key;
+	}
+
+	// give the user the option of creating new users to represent authors in the import file?
+	function allow_create_users() {
+		return apply_filters('import_allow_create_users', true);
+	}
+
+	// give the user the option of downloading and importing attached files
+	function allow_fetch_attachments() {
+		return apply_filters('import_allow_fetch_attachments', true);
+	}
+
+	function max_attachment_size() {
+		// can be overridden with a filter - 0 means no limit
+		return apply_filters('import_attachment_size_limit', 0);
+	}
+
+	function import_start() {
+		wp_defer_term_counting(true);
+		wp_defer_comment_counting(true);
+		do_action('import_start');
+	}
+
+	function import_end() {
+		do_action('import_end');
+
+		// clear the caches after backfilling
+		foreach ($this->post_ids_processed as $post_id)
+			clean_post_cache($post_id);
+
+		wp_defer_term_counting(false);
+		wp_defer_comment_counting(false);
+	}
+
+	function import($id, $fetch_attachments = false) {
+		$this->id = (int) $id;
+		$this->fetch_attachments = ($this->allow_fetch_attachments() && (bool) $fetch_attachments);
+
+		add_filter('import_post_meta_key', array($this, 'is_valid_meta_key'));
+		$file = get_attached_file($this->id);
+		$this->import_file($file);
+	}
+
+	function import_file($file) {
+		$this->file = $file;
+
+		$this->import_start();
+		$this->get_authors_from_post();
+		wp_suspend_cache_invalidation(true);
+		$this->get_entries();
+		$this->process_categories();
+		$this->process_tags();
+		$result = $this->process_posts();
+		wp_suspend_cache_invalidation(false);
+		$this->backfill_parents();
+		$this->backfill_attachment_urls();
+		$this->import_end();
+
+		if ( is_wp_error( $result ) )
+			return $result;
+	}
+
+	function handle_upload() {
+		$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 false;
+		}
+		$this->file = $file['file'];
+		$this->id = (int) $file['id'];
+		return true;
+	}
+
+	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');
+				if ( $this->handle_upload() )
+					$this->select_authors();
+				break;
+			case 2:
+				check_admin_referer('import-wordpress');
+				$result = $this->import( $_GET['id'], $_POST['attachments'] );
+				if ( is_wp_error( $result ) )
+					echo $result->get_error_message();
+				break;
+		}
+		$this->footer();
+	}
+
+	function WP_Import() {
+		// Nothing.
+	}
+}
+
+/**
+ * Register WordPress Importer
+ *
+ * @since unknown
+ * @var WP_Import
+ * @name $wp_import
+ */
+$wp_import = new WP_Import();
+
+register_importer('wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.'), array ($wp_import, 'dispatch'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import/wp-cat2tag.php b/mp-wp/wp-admin/import/wp-cat2tag.php
--- a/mp-wp/wp-admin/import/wp-cat2tag.php false
+++ b/mp-wp/wp-admin/import/wp-cat2tag.php 8efafe653749909462bbdcf77f3a4ced3dd6aed05e15bbd4757603e8f74d393f0cb5dd74e4867c3360ed38bb44458836c0a692e8d5e98de8a2ff44efadcf0069
@@ -0,0 +1,476 @@
+<?php
+/**
+ * WordPress Categories to Tags Converter.
+ *
+ * @package WordPress
+ * @subpackage Importer
+ */
+
+/**
+ * WordPress categories to tags converter class.
+ *
+ * Will convert WordPress categories to tags, removing the category after the
+ * process is complete and updating all posts to switch to the tag.
+ *
+ * @since unknown
+ */
+class WP_Categories_to_Tags {
+	var $categories_to_convert = array();
+	var $all_categories = array();
+	var $tags_to_convert = array();
+	var $all_tags = array();
+	var $hybrids_ids = array();
+
+	function header() {
+		echo '<div class="wrap">';
+		if ( ! current_user_can('manage_categories') ) {
+			echo '<div class="narrow">';
+			echo '<p>' . __('Cheatin&#8217; uh?') . '</p>';
+			echo '</div>';
+		} else { ?>
+			<div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag"><?php _e( "Categories to Tags" ); ?></a>
+			<a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&amp;step=3"><?php _e( "Tags to Categories" ); ?></a></p></div>
+<?php	}
+	}
+
+	function footer() {
+		echo '</div>';
+	}
+
+	function populate_cats() {
+
+		$categories = get_categories('get=all');
+		foreach ( $categories as $category ) {
+			$this->all_categories[] = $category;
+			if ( is_term( $category->slug, 'post_tag' ) )
+				$this->hybrids_ids[] = $category->term_id;
+		}
+	}
+
+	function populate_tags() {
+
+		$tags = get_terms( array('post_tag'), 'get=all' );
+		foreach ( $tags as $tag ) {
+			$this->all_tags[] = $tag;
+			if ( is_term( $tag->slug, 'category' ) )
+				$this->hybrids_ids[] = $tag->term_id;
+		}
+	}
+
+	function categories_tab() {
+		$this->populate_cats();
+		$cat_num = count($this->all_categories);
+
+		echo '<br class="clear" />';
+
+		if ( $cat_num > 0 ) {
+			screen_icon();
+			echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
+			echo '<div class="narrow">';
+			echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
+			echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
+
+			$this->categories_form();
+		} else {
+			echo '<p>'.__('You have no categories to convert!').'</p>';
+		}
+	}
+
+	function categories_form() { ?>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+var checkflag = "false";
+function check_all_rows() {
+	field = document.catlist;
+	if ( 'false' == checkflag ) {
+		for ( i = 0; i < field.length; i++ ) {
+			if ( 'cats_to_convert[]' == field[i].name )
+				field[i].checked = true;
+		}
+		checkflag = 'true';
+		return '<?php _e('Uncheck All') ?>';
+	} else {
+		for ( i = 0; i < field.length; i++ ) {
+			if ( 'cats_to_convert[]' == field[i].name )
+				field[i].checked = false;
+		}
+		checkflag = 'false';
+		return '<?php _e('Check All') ?>';
+	}
+}
+/* ]]> */
+</script>
+
+<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()" />
+<?php wp_nonce_field('import-cat2tag'); ?></p>
+<ul style="list-style:none">
+
+<?php	$hier = _get_term_hierarchy('category');
+
+		foreach ($this->all_categories as $category) {
+			$category = sanitize_term( $category, 'category', 'display' );
+
+			if ( (int) $category->parent == 0 ) { ?>
+
+	<li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
+
+				 if ( in_array( intval($category->term_id),  $this->hybrids_ids ) )
+				 	echo ' <a href="#note"> * </a>';
+
+				if ( isset($hier[$category->term_id]) )
+					$this->_category_children($category, $hier); ?></li>
+<?php		}
+		} ?>
+</ul>
+
+<?php	if ( ! empty($this->hybrids_ids) )
+			echo '<p><a name="note"></a>' . __('* This category is also a tag. Converting it will add that tag to all posts that are currently in the category.') . '</p>'; ?>
+
+<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
+</form>
+
+<?php }
+
+	function tags_tab() {
+		$this->populate_tags();
+		$tags_num = count($this->all_tags);
+
+		echo '<br class="clear" />';
+
+		if ( $tags_num > 0 ) {
+			screen_icon();
+			echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
+			echo '<div class="narrow">';
+			echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
+			echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
+
+			$this->tags_form();
+		} else {
+			echo '<p>'.__('You have no tags to convert!').'</p>';
+		}
+	}
+
+	function tags_form() { ?>
+
+<script type="text/javascript">
+/* <![CDATA[ */
+var checktags = "false";
+function check_all_tagrows() {
+	field = document.taglist;
+	if ( 'false' == checktags ) {
+		for ( i = 0; i < field.length; i++ ) {
+			if ( 'tags_to_convert[]' == field[i].name )
+				field[i].checked = true;
+		}
+		checktags = 'true';
+		return '<?php _e('Uncheck All') ?>';
+	} else {
+		for ( i = 0; i < field.length; i++ ) {
+			if ( 'tags_to_convert[]' == field[i].name )
+				field[i].checked = false;
+		}
+		checktags = 'false';
+		return '<?php _e('Check All') ?>';
+	}
+}
+/* ]]> */
+</script>
+
+<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
+<?php wp_nonce_field('import-cat2tag'); ?></p>
+<ul style="list-style:none">
+
+<?php	foreach ( $this->all_tags as $tag ) { ?>
+	<li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label><?php if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; ?></li>
+
+<?php	} ?>
+</ul>
+
+<?php	if ( ! empty($this->hybrids_ids) )
+			echo '<p><a name="note"></a>' . __('* This tag is also a category. When converted, all posts associated with the tag will also be in the category.') . '</p>'; ?>
+
+<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
+</form>
+
+<?php }
+
+	function _category_children($parent, $hier) { ?>
+
+		<ul style="list-style:none">
+<?php	foreach ($hier[$parent->term_id] as $child_id) {
+			$child =& get_category($child_id); ?>
+		<li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($child->term_id); ?>" /> <?php echo $child->name . ' (' . $child->count . ')'; ?></label><?php
+
+			if ( in_array( intval($child->term_id), $this->hybrids_ids ) )
+				echo ' <a href="#note"> * </a>';
+
+			if ( isset($hier[$child->term_id]) )
+				$this->_category_children($child, $hier); ?></li>
+<?php	} ?>
+		</ul><?php
+	}
+
+	function _category_exists($cat_id) {
+		$cat_id = (int) $cat_id;
+
+		$maybe_exists = category_exists($cat_id);
+
+		if ( $maybe_exists ) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function convert_categories() {
+		global $wpdb;
+
+		if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) { ?>
+			<div class="narrow">
+			<p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
+			</div>
+<?php		return;
+		}
+
+		if ( empty($this->categories_to_convert) )
+			$this->categories_to_convert = $_POST['cats_to_convert'];
+
+		$hier = _get_term_hierarchy('category');
+		$hybrid_cats = $clear_parents = $parents = false;
+		$clean_term_cache = $clean_cat_cache = array();
+		$default_cat = get_option('default_category');
+
+		echo '<ul>';
+
+		foreach ( (array) $this->categories_to_convert as $cat_id) {
+			$cat_id = (int) $cat_id;
+
+			if ( ! $this->_category_exists($cat_id) ) {
+				echo '<li>' . sprintf( __('Category %s doesn\'t exist!'),  $cat_id ) . "</li>\n";
+			} else {
+				$category =& get_category($cat_id);
+				echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name);
+
+				// If the category is the default, leave category in place and create tag.
+				if ( $default_cat == $category->term_id ) {
+
+					if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
+						$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');
+					$term_order = 0;
+
+					foreach ( $posts as $post ) {
+						$values[] = $wpdb->prepare( "(%d, %d, %d)", $post, $id, $term_order);
+						clean_post_cache($post);
+					}
+
+					if ( $values ) {
+						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+						$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $category->count, $category->term_id) );
+					}
+
+					echo __('Converted successfully.') . "</li>\n";
+					continue;
+				}
+
+				// if tag already exists, add it to all posts in the category
+				if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) {
+					$objects_ids = get_objects_in_term($category->term_id, 'category');
+					$tag_ttid = (int) $tag_ttid;
+					$term_order = 0;
+
+					foreach ( $objects_ids as $object_id )
+						$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tag_ttid, $term_order);
+
+					if ( $values ) {
+						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+						$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag_ttid) );
+						$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'post_tag'", $count, $category->term_id) );
+					}
+					echo __('Tag added to all posts in this category.') . " *</li>\n";
+
+					$hybrid_cats = true;
+					$clean_term_cache[] = $category->term_id;
+					$clean_cat_cache[] = $category->term_id;
+
+					continue;
+				}
+
+				$tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
+				if ( $tt_ids ) {
+					$posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
+					foreach ( (array) $posts as $post )
+						clean_post_cache($post);
+				}
+
+				// Change the category to a tag.
+				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
+
+				// Set all parents to 0 (root-level) if their parent was the converted tag
+				$parents = $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
+
+				if ( $parents ) $clear_parents = true;
+				$clean_cat_cache[] = $category->term_id;
+				echo __('Converted successfully.') . "</li>\n";
+			}
+		}
+		echo '</ul>';
+
+		if ( ! empty($clean_term_cache) ) {
+			$clean_term_cache = array_unique(array_values($clean_term_cache));
+			foreach ( $clean_term_cache as $id )
+				wp_cache_delete($id, 'post_tag');
+		}
+
+		if ( ! empty($clean_cat_cache) ) {
+			$clean_cat_cache = array_unique(array_values($clean_cat_cache));
+			foreach ( $clean_cat_cache as $id )
+				wp_cache_delete($id, 'category');
+		}
+
+		if ( $clear_parents ) delete_option('category_children');
+
+		if ( $hybrid_cats )
+			echo '<p>' . sprintf( __('* This category is also a tag. The converter has added that tag to all posts currently in the category. If you want to remove it, please confirm that all tags were added successfully, then delete it from the <a href="%s">Manage Categories</a> page.'), 'categories.php') . '</p>';
+		echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag' ) . '</p>';
+	}
+
+	function convert_tags() {
+		global $wpdb;
+
+		if ( (!isset($_POST['tags_to_convert']) || !is_array($_POST['tags_to_convert'])) && empty($this->tags_to_convert)) {
+			echo '<div class="narrow">';
+			echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3') . '</p>';
+			echo '</div>';
+			return;
+		}
+
+		if ( empty($this->tags_to_convert) )
+			$this->tags_to_convert = $_POST['tags_to_convert'];
+
+		$hybrid_tags = $clear_parents = false;
+		$clean_cat_cache = $clean_term_cache = array();
+		$default_cat = get_option('default_category');
+		echo '<ul>';
+
+		foreach ( (array) $this->tags_to_convert as $tag_id) {
+			$tag_id = (int) $tag_id;
+
+			if ( $tag = get_term( $tag_id, 'post_tag' ) ) {
+				printf('<li>' . __('Converting tag <strong>%s</strong> ... '),  $tag->name);
+
+				if ( $cat_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $tag->term_id) ) ) {
+					$objects_ids = get_objects_in_term($tag->term_id, 'post_tag');
+					$cat_ttid = (int) $cat_ttid;
+					$term_order = 0;
+
+					foreach ( $objects_ids as $object_id ) {
+						$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $cat_ttid, $term_order);
+						clean_post_cache($object_id);
+					}
+
+					if ( $values ) {
+						$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+
+						if ( $default_cat != $tag->term_id ) {
+							$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tag->term_id) );
+							$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_id = %d AND taxonomy = 'category'", $count, $tag->term_id) );
+						}
+					}
+
+					$hybrid_tags = true;
+					$clean_term_cache[] = $tag->term_id;
+					$clean_cat_cache[] = $tag->term_id;
+					echo __('All posts were added to the category with the same name.') . " *</li>\n";
+
+					continue;
+				}
+
+				// Change the tag to a category.
+				$parent = $wpdb->get_var( $wpdb->prepare("SELECT parent FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
+				if ( 0 == $parent || (0 < (int) $parent && $this->_category_exists($parent)) ) {
+					$reset_parent = '';
+					$clear_parents = true;
+				} else
+					$reset_parent = ", parent = '0'";
+
+				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'category' $reset_parent WHERE term_id = %d AND taxonomy = 'post_tag'", $tag->term_id) );
+
+				$clean_term_cache[] = $tag->term_id;
+				$clean_cat_cache[] = $cat['term_id'];
+				echo __('Converted successfully.') . "</li>\n";
+
+			} else {
+				printf( '<li>' . __('Tag #%s doesn\'t exist!') . "</li>\n",  $tag_id );
+			}
+		}
+
+		if ( ! empty($clean_term_cache) ) {
+			$clean_term_cache = array_unique(array_values($clean_term_cache));
+			foreach ( $clean_term_cache as $id )
+				wp_cache_delete($id, 'post_tag');
+		}
+
+		if ( ! empty($clean_cat_cache) ) {
+			$clean_cat_cache = array_unique(array_values($clean_cat_cache));
+			foreach ( $clean_cat_cache as $id )
+				wp_cache_delete($id, 'category');
+		}
+
+		if ( $clear_parents ) delete_option('category_children');
+
+		echo '</ul>';
+		if ( $hybrid_tags )
+			echo '<p>' . sprintf( __('* This tag is also a category. The converter has added all posts from it to the category. If you want to remove it, please confirm that all posts were added successfully, then delete it from the <a href="%s">Manage Tags</a> page.'), 'edit-tags.php') . '</p>';
+		echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3' ) . '</p>';
+	}
+
+	function init() {
+
+		$step = (isset($_GET['step'])) ? (int) $_GET['step'] : 1;
+
+		$this->header();
+
+		if ( current_user_can('manage_categories') ) {
+
+			switch ($step) {
+				case 1 :
+					$this->categories_tab();
+				break;
+
+				case 2 :
+					check_admin_referer('import-cat2tag');
+					$this->convert_categories();
+				break;
+
+				case 3 :
+					$this->tags_tab();
+				break;
+
+				case 4 :
+					check_admin_referer('import-cat2tag');
+					$this->convert_tags();
+				break;
+			}
+		}
+
+		$this->footer();
+	}
+
+	function WP_Categories_to_Tags() {
+		// Do nothing.
+	}
+}
+
+$wp_cat2tag_importer = new WP_Categories_to_Tags();
+
+register_importer('wp-cat2tag', __('Categories and Tags Converter'), __('Convert existing categories to tags or tags to categories, selectively.'), array(&$wp_cat2tag_importer, 'init'));
+
+?>
diff -uNr a/mp-wp/wp-admin/import.php b/mp-wp/wp-admin/import.php
--- a/mp-wp/wp-admin/import.php false
+++ b/mp-wp/wp-admin/import.php 897774b9d3f8540845fb15ecee11b90e2afe56017750628c7b28a28f10cd15bfacc4d640da4407d1064d28bf868f01df283cfbf144468affd79f08588b7d09e1
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Import WordPress Administration Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */
+require_once ('admin.php');
+$title = __('Import');
+require_once ('admin-header.php');
+$parent_file = 'tools.php';
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></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" cellspacing="0">
+
+<?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 row-title'>$action</td>
+				<td class='desc'>{$data[1]}</td>
+			</tr>";
+	}
+?>
+
+</table>
+<?php
+}
+?>
+
+</div>
+
+<?php
+
+include ('admin-footer.php');
+?>
+
diff -uNr a/mp-wp/wp-admin/includes/admin.php b/mp-wp/wp-admin/includes/admin.php
--- a/mp-wp/wp-admin/includes/admin.php false
+++ b/mp-wp/wp-admin/includes/admin.php 7ff0db86177aa1b9b9311145b1f22df996294b9149316b0eb15eddaaea4d1b72f1ac6c54ad430988dd10d6df7ba176b85129a39a1b66e6826e2f1f801e667129
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Includes all of the WordPress Administration API files.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Bookmark Administration API */
+require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
+
+/** WordPress Comment Administration API */
+require_once(ABSPATH . 'wp-admin/includes/comment.php');
+
+/** WordPress Administration File API */
+require_once(ABSPATH . 'wp-admin/includes/file.php');
+
+/** WordPress Image Administration API */
+require_once(ABSPATH . 'wp-admin/includes/image.php');
+
+/** WordPress Media Administration API */
+require_once(ABSPATH . 'wp-admin/includes/media.php');
+
+/** WordPress Import Administration API */
+require_once(ABSPATH . 'wp-admin/includes/import.php');
+
+/** WordPress Misc Administration API */
+require_once(ABSPATH . 'wp-admin/includes/misc.php');
+
+/** WordPress Plugin Administration API */
+require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+
+/** WordPress Post Administration API */
+require_once(ABSPATH . 'wp-admin/includes/post.php');
+
+/** WordPress Taxonomy Administration API */
+require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
+
+/** WordPress Template Administration API */
+require_once(ABSPATH . 'wp-admin/includes/template.php');
+
+/** WordPress Theme Administration API */
+require_once(ABSPATH . 'wp-admin/includes/theme.php');
+
+/** WordPress User Administration API */
+require_once(ABSPATH . 'wp-admin/includes/user.php');
+
+/** WordPress Update Administration API */
+require_once(ABSPATH . 'wp-admin/includes/update.php');
+
+/** WordPress Registration API */
+require_once(ABSPATH . WPINC . '/registration.php');
+
+?>
\ No newline at end of file
diff -uNr a/mp-wp/wp-admin/includes/bookmark.php b/mp-wp/wp-admin/includes/bookmark.php
--- a/mp-wp/wp-admin/includes/bookmark.php false
+++ b/mp-wp/wp-admin/includes/bookmark.php 1c639b91ac9a2dac87aaabf0634d11f260123f2c8fcb9521041069ad3bc74e490492a16d8442ade919aa7dad594e6fc147902ba482899619d6ddd31dcccb7915
@@ -0,0 +1,268 @@
+<?php
+/**
+ * WordPress Bookmark Administration API
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @return unknown
+ */
+function add_link() {
+	return edit_link();
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $link_id
+ * @return unknown
+ */
+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 ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+		$_POST['link_visible'] = 'Y';
+
+	if ( !empty( $link_id ) ) {
+		$_POST['link_id'] = $link_id;
+		return wp_update_link( $_POST);
+	} else {
+		return wp_insert_link( $_POST);
+	}
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @return unknown
+ */
+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;
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $link_id
+ * @return unknown
+ */
+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( $wpdb->prepare( "DELETE FROM $wpdb->links WHERE link_id = %d", $link_id ) );
+
+	do_action( 'deleted_link', $link_id );
+
+	clean_bookmark_cache( $link_id );
+
+	return true;
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $link_id
+ * @return unknown
+ */
+function wp_get_link_cats( $link_id = 0 ) {
+
+	$cats = wp_get_object_terms( $link_id, 'link_category', 'fields=ids' );
+
+	return array_unique( $cats );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $link_id
+ * @return unknown
+ */
+function get_link_to_edit( $link_id ) {
+	return get_bookmark( $link_id, OBJECT, 'edit' );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $linkdata
+ * @return unknown
+ */
+function wp_insert_link( $linkdata, $wp_error = false ) {
+	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( stripslashes_deep( $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 ( ! isset( $link_category ) ||0 == count( $link_category ) || !is_array( $link_category ) ) {
+		$link_category = array( get_option( 'default_link_category' ) );
+	}
+
+	if ( $update ) {
+		if ( false === $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_url = %s,
+			link_name = %s, link_image = %s, link_target = %s,
+			link_visible = %s, link_description = %s, link_rating = %s,
+			link_rel = %s, link_notes = %s, link_rss = %s
+			WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id ) ) ) {
+			if ( $wp_error )
+				return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+			else
+				return 0;
+		}
+	} else {
+		if ( false === $wpdb->query( $wpdb->prepare( "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(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
+		$link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss ) ) ) {
+			if ( $wp_error )
+				return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+			else
+				return 0;
+		}
+		$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 );
+
+	clean_bookmark_cache( $link_id );
+
+	return $link_id;
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $link_id
+ * @param unknown_type $link_categories
+ */
+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' );
+
+	clean_bookmark_cache( $link_id );
+}	// wp_set_link_cats()
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $linkdata
+ * @return unknown
+ */
+function wp_update_link( $linkdata ) {
+	$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 );
+}
+
+?>
diff -uNr a/mp-wp/wp-admin/includes/class-ftp-pure.php b/mp-wp/wp-admin/includes/class-ftp-pure.php
--- a/mp-wp/wp-admin/includes/class-ftp-pure.php false
+++ b/mp-wp/wp-admin/includes/class-ftp-pure.php a9f2d1d00d44f7dccb725f62945671e8db11e372b171af53a05b97dafda5c17ff3f88c76152ebed3bbe32c708e3e8f406e0ce7ad72ca237fbb287f8670ddfbff
@@ -0,0 +1,190 @@
+<?php
+/**
+ * PemFTP - A Ftp implementation in pure PHP
+ *
+ * @package PemFTP
+ * @since 2.5
+ *
+ * @version 1.0
+ * @copyright Alexey Dotsenko
+ * @author Alexey Dotsenko
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ */
+
+/**
+ * FTP implementation using fsockopen to connect.
+ *
+ * @package PemFTP
+ * @subpackage Pure
+ * @since 2.5
+ *
+ * @version 1.0
+ * @copyright Alexey Dotsenko
+ * @author Alexey Dotsenko
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ */
+class ftp extends ftp_base {
+
+	function ftp($verb=FALSE, $le=FALSE) {
+		$this->__construct($verb, $le);
+	}
+
+	function __construct($verb=FALSE, $le=FALSE) {
+		parent::__construct(false, $verb, $le);
+	}
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Private functions                                                                 -->
+// <!-- --------------------------------------------------------------------------------------- -->
+
+	function _settimeout($sock) {
+		if(!@stream_set_timeout($sock, $this->_timeout)) {
+			$this->PushError('_settimeout','socket set send timeout');
+			$this->_quit();
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	function _connect($host, $port) {
+		$this->SendMSG("Creating socket");
+		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
+		if (!$sock) {
+			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
+			return FALSE;
+		}
+		$this->_connected=true;
+		return $sock;
+	}
+
+	function _readmsg($fnction="_readmsg"){
+		if(!$this->_connected) {
+			$this->PushError($fnction, 'Connect first');
+			return FALSE;
+		}
+		$result=true;
+		$this->_message="";
+		$this->_code=0;
+		$go=true;
+		do {
+			$tmp=@fgets($this->_ftp_control_sock, 512);
+			if($tmp===false) {
+				$go=$result=false;
+				$this->PushError($fnction,'Read failed');
+			} else {
+				$this->_message.=$tmp;
+				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+			}
+		} while($go);
+		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code=(int)$regs[1];
+		return $result;
+	}
+
+	function _exec($cmd, $fnction="_exec") {
+		if(!$this->_ready) {
+			$this->PushError($fnction,'Connect first');
+			return FALSE;
+		}
+		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
+		if($status===false) {
+			$this->PushError($fnction,'socket write failed');
+			return FALSE;
+		}
+		$this->_lastaction=time();
+		if(!$this->_readmsg($fnction)) return FALSE;
+		return TRUE;
+	}
+
+	function _data_prepare($mode=FTP_ASCII) {
+		if(!$this->_settype($mode)) return FALSE;
+		if($this->_passive) {
+			if(!$this->_exec("PASV", "pasv")) {
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				$this->_data_close();
+				return FALSE;
+			}
+			$ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
+			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
+			if(!$this->_ftp_data_sock) {
+				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
+				$this->_data_close();
+				return FALSE;
+			}
+			else $this->_ftp_data_sock;
+		} else {
+			$this->SendMSG("Only passive connections available!");
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	function _data_read($mode=FTP_ASCII, $fp=NULL) {
+		if(is_resource($fp)) $out=0;
+		else $out="";
+		if(!$this->_passive) {
+			$this->SendMSG("Only passive connections available!");
+			return FALSE;
+		}
+		while (!feof($this->_ftp_data_sock)) {
+			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
+			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
+			else $out.=$block;
+		}
+		return $out;
+	}
+
+	function _data_write($mode=FTP_ASCII, $fp=NULL) {
+		if(is_resource($fp)) $out=0;
+		else $out="";
+		if(!$this->_passive) {
+			$this->SendMSG("Only passive connections available!");
+			return FALSE;
+		}
+		if(is_resource($fp)) {
+			while(!feof($fp)) {
+				$block=fread($fp, $this->_ftp_buff_size);
+				if(!$this->_data_write_block($mode, $block)) return false;
+			}
+		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		return TRUE;
+	}
+
+	function _data_write_block($mode, $block) {
+		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		do {
+			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
+				$this->PushError("_data_write","Can't write to socket");
+				return FALSE;
+			}
+			$block=substr($block, $t);
+		} while(!empty($block));
+		return true;
+	}
+
+	function _data_close() {
+		@fclose($this->_ftp_data_sock);
+		$this->SendMSG("Disconnected data from remote host");
+		return TRUE;
+	}
+
+	function _quit($force=FALSE) {
+		if($this->_connected or $force) {
+			@fclose($this->_ftp_control_sock);
+			$this->_connected=false;
+			$this->SendMSG("Socket closed");
+		}
+	}
+}
+
+?>
diff -uNr a/mp-wp/wp-admin/includes/class-ftp-sockets.php b/mp-wp/wp-admin/includes/class-ftp-sockets.php
--- a/mp-wp/wp-admin/includes/class-ftp-sockets.php false
+++ b/mp-wp/wp-admin/includes/class-ftp-sockets.php 56c2fdef9aa566641b3386d291e7a5b5e145922e360cd27bbd3eb3e1e172d5016b6adb38be436dd47680759e28d097c00b4c96be2b3bcef78fe522d05d7ca22c
@@ -0,0 +1,250 @@
+<?php
+/**
+ * PemFTP - A Ftp implementation in pure PHP
+ *
+ * @package PemFTP
+ * @since 2.5
+ *
+ * @version 1.0
+ * @copyright Alexey Dotsenko
+ * @author Alexey Dotsenko
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ */
+
+/**
+ * Socket Based FTP implementation
+ *
+ * @package PemFTP
+ * @subpackage Socket
+ * @since 2.5
+ *
+ * @version 1.0
+ * @copyright Alexey Dotsenko
+ * @author Alexey Dotsenko
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ */
+class ftp extends ftp_base {
+
+	function ftp($verb=FALSE, $le=FALSE) {
+		$this->__construct($verb, $le);
+	}
+
+	function __construct($verb=FALSE, $le=FALSE) {
+		parent::__construct(true, $verb, $le);
+	}
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Private functions                                                                 -->
+// <!-- --------------------------------------------------------------------------------------- -->
+
+	function _settimeout($sock) {
+		if(!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect','socket set receive timeout',socket_strerror(socket_last_error($sock)));
+			@socket_close($sock);
+			return FALSE;
+		}
+		if(!@socket_set_option($sock, SOL_SOCKET , SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect','socket set send timeout',socket_strerror(socket_last_error($sock)));
+			@socket_close($sock);
+			return FALSE;
+		}
+		return true;
+	}
+
+	function _connect($host, $port) {
+		$this->SendMSG("Creating socket");
+		if(!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
+			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
+			return FALSE;
+		}
+		if(!$this->_settimeout($sock)) return FALSE;
+		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
+		if (!($res = @socket_connect($sock, $host, $port))) {
+			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
+			@socket_close($sock);
+			return FALSE;
+		}
+		$this->_connected=true;
+		return $sock;
+	}
+
+	function _readmsg($fnction="_readmsg"){
+		if(!$this->_connected) {
+			$this->PushError($fnction,'Connect first');
+			return FALSE;
+		}
+		$result=true;
+		$this->_message="";
+		$this->_code=0;
+		$go=true;
+		do {
+			$tmp=@socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
+			if($tmp===false) {
+				$go=$result=false;
+				$this->PushError($fnction,'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			} else {
+				$this->_message.=$tmp;
+				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
+			}
+		} while($go);
+		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code=(int)$regs[1];
+		return $result;
+	}
+
+	function _exec($cmd, $fnction="_exec") {
+		if(!$this->_ready) {
+			$this->PushError($fnction,'Connect first');
+			return FALSE;
+		}
+		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
+		if($status===false) {
+			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
+			return FALSE;
+		}
+		$this->_lastaction=time();
+		if(!$this->_readmsg($fnction)) return FALSE;
+		return TRUE;
+	}
+
+	function _data_prepare($mode=FTP_ASCII) {
+		if(!$this->_settype($mode)) return FALSE;
+		$this->SendMSG("Creating data socket");
+		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+		if ($this->_ftp_data_sock < 0) {
+			$this->PushError('_data_prepare','socket create failed',socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			return FALSE;
+		}
+		if(!$this->_settimeout($this->_ftp_data_sock)) {
+			$this->_data_close();
+			return FALSE;
+		}
+		if($this->_passive) {
+			if(!$this->_exec("PASV", "pasv")) {
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				$this->_data_close();
+				return FALSE;
+			}
+			$ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
+			if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
+		} else {
+			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
+				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!@socket_bind($this->_ftp_data_sock,$addr)){
+				$this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!@socket_listen($this->_ftp_data_sock)) {
+				$this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!$this->_exec('PORT '.str_replace('.',',',$this->_datahost.'.'.($this->_dataport>>8).'.'.($this->_dataport&0x00FF)), "_port")) {
+				$this->_data_close();
+				return FALSE;
+			}
+			if(!$this->_checkCode()) {
+				$this->_data_close();
+				return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	function _data_read($mode=FTP_ASCII, $fp=NULL) {
+		$NewLine=$this->_eol_code[$this->OS_local];
+		if(is_resource($fp)) $out=0;
+		else $out="";
+		if(!$this->_passive) {
+			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
+			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
+			if($this->_ftp_temp_sock===FALSE) {
+				$this->PushError("_data_read","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+		}
+
+		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
+			if($block==="") break;
+			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
+			else $out.=$block;
+		}
+		return $out;
+	}
+
+	function _data_write($mode=FTP_ASCII, $fp=NULL) {
+		$NewLine=$this->_eol_code[$this->OS_local];
+		if(is_resource($fp)) $out=0;
+		else $out="";
+		if(!$this->_passive) {
+			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
+			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
+			if($this->_ftp_temp_sock===FALSE) {
+				$this->PushError("_data_write","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+				$this->_data_close();
+				return false;
+			}
+		}
+		if(is_resource($fp)) {
+			while(!feof($fp)) {
+				$block=fread($fp, $this->_ftp_buff_size);
+				if(!$this->_data_write_block($mode, $block)) return false;
+			}
+		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		return true;
+	}
+
+	function _data_write_block($mode, $block) {
+		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		do {
+			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
+				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+				$this->_data_close();
+				return FALSE;
+			}
+			$block=substr($block, $t);
+		} while(!empty($block));
+		return true;
+	}
+
+	function _data_close() {
+		@socket_close($this->_ftp_temp_sock);
+		@socket_close($this->_ftp_data_sock);
+		$this->SendMSG("Disconnected data from remote host");
+		return TRUE;
+	}
+
+	function _quit() {
+		if($this->_connected) {
+			@socket_close($this->_ftp_control_sock);
+			$this->_connected=false;
+			$this->SendMSG("Socket closed");
+		}
+	}
+}
+?>
diff -uNr a/mp-wp/wp-admin/includes/class-ftp.php b/mp-wp/wp-admin/includes/class-ftp.php
--- a/mp-wp/wp-admin/includes/class-ftp.php false
+++ b/mp-wp/wp-admin/includes/class-ftp.php 8185d683b8a515bf775bf085fc12821072fd3378a6168c8f652aa59595edd0b9632716741009a1af0e120f6f4eb027c8d9a9a1576d6c5ca0bf322328b26668d9
@@ -0,0 +1,903 @@
+<?php
+/**
+ * PemFTP - A Ftp implementation in pure PHP
+ *
+ * @package PemFTP
+ * @since 2.5
+ *
+ * @version 1.0
+ * @copyright Alexey Dotsenko
+ * @author Alexey Dotsenko
+ * @link http://www.phpclasses.org/browse/package/1743.html Site
+ * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ */
+
+/**
+ * Defines the newline characters, if not defined already.
+ *
+ * This can be redefined.
+ *
+ * @since 2.5
+ * @var string
+ */
+if(!defined('CRLF')) define('CRLF',"\r\n");
+
+/**
+ * Sets whatever to autodetect ASCII mode.
+ *
+ * This can be redefined.
+ *
+ * @since 2.5
+ * @var int
+ */
+if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+
+/**
+ *
+ * This can be redefined.
+ * @since 2.5
+ * @var int
+ */
+if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+
+/**
+ *
+ * This can be redefined.
+ * @since 2.5
+ * @var int
+ */
+if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+
+/**
+ * Whether to force FTP.
+ *
+ * This can be redefined.
+ *
+ * @since 2.5
+ * @var bool
+ */
+if(!defined('FTP_FORCE')) define('FTP_FORCE', true);
+
+/**
+ * @since 2.5
+ * @var string
+ */
+define('FTP_OS_Unix','u');
+
+/**
+ * @since 2.5
+ * @var string
+ */
+define('FTP_OS_Windows','w');
+
+/**
+ * @since 2.5
+ * @var string
+ */
+define('FTP_OS_Mac','m');
+
+/**
+ * PemFTP base class
+ *
+ */
+class ftp_base {
+	/* Public variables */
+	var $LocalEcho;
+	var $Verbose;
+	var $OS_local;
+	var $OS_remote;
+
+	/* Private variables */
+	var $_lastaction;
+	var $_errors;
+	var $_type;
+	var $_umask;
+	var $_timeout;
+	var $_passive;
+	var $_host;
+	var $_fullhost;
+	var $_port;
+	var $_datahost;
+	var $_dataport;
+	var $_ftp_control_sock;
+	var $_ftp_data_sock;
+	var $_ftp_temp_sock;
+	var $_ftp_buff_size;
+	var $_login;
+	var $_password;
+	var $_connected;
+	var $_ready;
+	var $_code;
+	var $_message;
+	var $_can_restore;
+	var $_port_available;
+	var $_curtype;
+	var $_features;
+
+	var $_error_array;
+	var $AuthorizedTransferMode;
+	var $OS_FullName;
+	var $_eol_code;
+	var $AutoAsciiExt;
+
+	/* Constructor */
+	function ftp_base($port_mode=FALSE) {
+		$this->__construct($port_mode);
+	}
+
+	function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) {
+		$this->LocalEcho=$le;
+		$this->Verbose=$verb;
+		$this->_lastaction=NULL;
+		$this->_error_array=array();
+		$this->_eol_code=array(FTP_OS_Unix=>"\n", FTP_OS_Mac=>"\r", FTP_OS_Windows=>"\r\n");
+		$this->AuthorizedTransferMode=array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
+		$this->OS_FullName=array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
+		$this->AutoAsciiExt=array("ASP","BAT","C","CPP","CSS","CSV","JS","H","HTM","HTML","SHTML","INI","LOG","PHP3","PHTML","PL","PERL","SH","SQL","TXT");
+		$this->_port_available=($port_mode==TRUE);
+		$this->SendMSG("Staring FTP client class".($this->_port_available?"":" without PORT mode support"));
+		$this->_connected=FALSE;
+		$this->_ready=FALSE;
+		$this->_can_restore=FALSE;
+		$this->_code=0;
+		$this->_message="";
+		$this->_ftp_buff_size=4096;
+		$this->_curtype=NULL;
+		$this->SetUmask(0022);
+		$this->SetType(FTP_AUTOASCII);
+		$this->SetTimeout(30);
+		$this->Passive(!$this->_port_available);
+		$this->_login="anonymous";
+		$this->_password="anon@ftp.com";
+		$this->_features=array();
+	    $this->OS_local=FTP_OS_Unix;
+		$this->OS_remote=FTP_OS_Unix;
+		$this->features=array();
+		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
+		elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
+	}
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Public functions                                                                  -->
+// <!-- --------------------------------------------------------------------------------------- -->
+
+	function parselisting($line) {
+		$is_windows = ($this->OS_remote == FTP_OS_Windows);
+		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/",$line,$lucifer)) {
+			$b = array();
+			if ($lucifer[3]<70) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
+			$b['isdir'] = ($lucifer[7]=="<DIR>");
+			if ( $b['isdir'] )
+				$b['type'] = 'd';
+			else
+				$b['type'] = 'f';
+			$b['size'] = $lucifer[7];
+			$b['month'] = $lucifer[1];
+			$b['day'] = $lucifer[2];
+			$b['year'] = $lucifer[3];
+			$b['hour'] = $lucifer[4];
+			$b['minute'] = $lucifer[5];
+			$b['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
+			$b['am/pm'] = $lucifer[6];
+			$b['name'] = $lucifer[8];
+		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+			//echo $line."\n";
+			$lcount=count($lucifer);
+			if ($lcount<8) return '';
+			$b = array();
+			$b['isdir'] = $lucifer[0]{0} === "d";
+			$b['islink'] = $lucifer[0]{0} === "l";
+			if ( $b['isdir'] )
+				$b['type'] = 'd';
+			elseif ( $b['islink'] )
+				$b['type'] = 'l';
+			else
+				$b['type'] = 'f';
+			$b['perms'] = $lucifer[0];
+			$b['number'] = $lucifer[1];
+			$b['owner'] = $lucifer[2];
+			$b['group'] = $lucifer[3];
+			$b['size'] = $lucifer[4];
+			if ($lcount==8) {
+				sscanf($lucifer[5],"%d-%d-%d",$b['year'],$b['month'],$b['day']);
+				sscanf($lucifer[6],"%d:%d",$b['hour'],$b['minute']);
+				$b['time'] = @mktime($b['hour'],$b['minute'],0,$b['month'],$b['day'],$b['year']);
+				$b['name'] = $lucifer[7];
+			} else {
+				$b['month'] = $lucifer[5];
+				$b['day'] = $lucifer[6];
+				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
+					$b['year'] = date("Y");
+					$b['hour'] = $l2[1];
+					$b['minute'] = $l2[2];
+				} else {
+					$b['year'] = $lucifer[7];
+					$b['hour'] = 0;
+					$b['minute'] = 0;
+				}
+				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b['day'],$b['month'],$b['year'],$b['hour'],$b['minute']));
+				$b['name'] = $lucifer[8];
+			}
+		}
+
+		return $b;
+	}
+
+	function SendMSG($message = "", $crlf=true) {
+		if ($this->Verbose) {
+			echo $message.($crlf?CRLF:"");
+			flush();
+		}
+		return TRUE;
+	}
+
+	function SetType($mode=FTP_AUTOASCII) {
+		if(!in_array($mode, $this->AuthorizedTransferMode)) {
+			$this->SendMSG("Wrong type");
+			return FALSE;
+		}
+		$this->_type=$mode;
+		$this->SendMSG("Transfer type: ".($this->_type==FTP_BINARY?"binary":($this->_type==FTP_ASCII?"ASCII":"auto ASCII") ) );
+		return TRUE;
+	}
+
+	function _settype($mode=FTP_ASCII) {
+		if($this->_ready) {
+			if($mode==FTP_BINARY) {
+				if($this->_curtype!=FTP_BINARY) {
+					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
+					$this->_curtype=FTP_BINARY;
+				}
+			} elseif($this->_curtype!=FTP_ASCII) {
+				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
+				$this->_curtype=FTP_ASCII;
+			}
+		} else return FALSE;
+		return TRUE;
+	}
+
+	function Passive($pasv=NULL) {
+		if(is_null($pasv)) $this->_passive=!$this->_passive;
+		else $this->_passive=$pasv;
+		if(!$this->_port_available and !$this->_passive) {
+			$this->SendMSG("Only passive connections available!");
+			$this->_passive=TRUE;
+			return FALSE;
+		}
+		$this->SendMSG("Passive mode ".($this->_passive?"on":"off"));
+		return TRUE;
+	}
+
+	function SetServer($host, $port=21, $reconnect=true) {
+		if(!is_long($port)) {
+	        $this->verbose=true;
+    	    $this->SendMSG("Incorrect port syntax");
+			return FALSE;
+		} else {
+			$ip=@gethostbyname($host);
+	        $dns=@gethostbyaddr($host);
+	        if(!$ip) $ip=$host;
+	        if(!$dns) $dns=$host;
+			if(ip2long($ip) === -1) {
+				$this->SendMSG("Wrong host name/address \"".$host."\"");
+				return FALSE;
+			}
+	        $this->_host=$ip;
+	        $this->_fullhost=$dns;
+	        $this->_port=$port;
+	        $this->_dataport=$port-1;
+		}
+		$this->SendMSG("Host \"".$this->_fullhost."(".$this->_host."):".$this->_port."\"");
+		if($reconnect){
+			if($this->_connected) {
+				$this->SendMSG("Reconnecting");
+				if(!$this->quit(FTP_FORCE)) return FALSE;
+				if(!$this->connect()) return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	function SetUmask($umask=0022) {
+		$this->_umask=$umask;
+		umask($this->_umask);
+		$this->SendMSG("UMASK 0".decoct($this->_umask));
+		return TRUE;
+	}
+
+	function SetTimeout($timeout=30) {
+		$this->_timeout=$timeout;
+		$this->SendMSG("Timeout ".$this->_timeout);
+		if($this->_connected)
+			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		return TRUE;
+	}
+
+	function connect($server=NULL) {
+		if(!empty($server)) {
+			if(!$this->SetServer($server)) return false;
+		}
+		if($this->_ready) return true;
+	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
+		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
+			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
+			return FALSE;
+		}
+		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
+		do {
+			if(!$this->_readmsg()) return FALSE;
+			if(!$this->_checkCode()) return FALSE;
+			$this->_lastaction=time();
+		} while($this->_code<200);
+		$this->_ready=true;
+		$syst=$this->systype();
+		if(!$syst) $this->SendMSG("Can't detect remote OS");
+		else {
+			if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows;
+			elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac;
+			elseif(preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote=FTP_OS_Unix;
+			else $this->OS_remote=FTP_OS_Mac;
+			$this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]);
+		}
+		if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
+		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		return TRUE;
+	}
+
+	function quit($force=false) {
+		if($this->_ready) {
+			if(!$this->_exec("QUIT") and !$force) return FALSE;
+			if(!$this->_checkCode() and !$force) return FALSE;
+			$this->_ready=false;
+			$this->SendMSG("Session finished");
+		}
+		$this->_quit();
+		return TRUE;
+	}
+
+	function login($user=NULL, $pass=NULL) {
+		if(!is_null($user)) $this->_login=$user;
+		else $this->_login="anonymous";
+		if(!is_null($pass)) $this->_password=$pass;
+		else $this->_password="anon@anon.com";
+		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		if($this->_code!=230) {
+			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
+			if(!$this->_checkCode()) return FALSE;
+		}
+		$this->SendMSG("Authentication succeeded");
+		if(empty($this->_features)) {
+			if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
+			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		}
+		return TRUE;
+	}
+
+	function pwd() {
+		if(!$this->_exec("PWD", "pwd")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
+	}
+
+	function cdup() {
+		if(!$this->_exec("CDUP", "cdup")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return true;
+	}
+
+	function chdir($pathname) {
+		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function rmdir($pathname) {
+		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function mkdir($pathname) {
+		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function rename($from, $to) {
+		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		if($this->_code==350) {
+			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
+			if(!$this->_checkCode()) return FALSE;
+		} else return FALSE;
+		return TRUE;
+	}
+
+	function filesize($pathname) {
+		if(!isset($this->_features["SIZE"])) {
+			$this->PushError("filesize", "not supported by server");
+			return FALSE;
+		}
+		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+	}
+
+	function abort() {
+		if(!$this->_exec("ABOR", "abort")) return FALSE;
+		if(!$this->_checkCode()) {
+			if($this->_code!=426) return FALSE;
+			if(!$this->_readmsg("abort")) return FALSE;
+			if(!$this->_checkCode()) return FALSE;
+		}
+		return true;
+	}
+
+	function mdtm($pathname) {
+		if(!isset($this->_features["MDTM"])) {
+			$this->PushError("mdtm", "not supported by server");
+			return FALSE;
+		}
+		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		$mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
+		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
+		return $timestamp;
+	}
+
+	function systype() {
+		if(!$this->_exec("SYST", "systype")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		$DATA = explode(" ", $this->_message);
+		return array($DATA[1], $DATA[3]);
+	}
+
+	function delete($pathname) {
+		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function site($command, $fnction="site") {
+		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function chmod($pathname, $mode) {
+		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
+		return TRUE;
+	}
+
+	function restore($from) {
+		if(!isset($this->_features["REST"])) {
+			$this->PushError("restore", "not supported by server");
+			return FALSE;
+		}
+		if($this->_curtype!=FTP_BINARY) {
+			$this->PushError("restore", "can't restore in ASCII mode");
+			return FALSE;
+		}
+		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return TRUE;
+	}
+
+	function features() {
+		if(!$this->_exec("FEAT", "features")) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
+		$this->_features=array();
+		foreach($f as $k=>$v) {
+			$v=explode(" ", trim($v));
+			$this->_features[array_shift($v)]=$v;;
+		}
+		return true;
+	}
+
+	function rawlist($pathname="", $arg="") {
+		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
+	}
+
+	function nlist($pathname="") {
+		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
+	}
+
+	function is_exists($pathname) {
+		return $this->file_exists($pathname);
+	}
+
+	function file_exists($pathname) {
+		$exists=true;
+		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
+		else {
+			if(!$this->_checkCode()) $exists=FALSE;
+			$this->abort();
+		}
+		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
+		else $this->SendMSG("Remote file ".$pathname." does not exist");
+		return $exists;
+	}
+
+	function fget($fp, $remotefile,$rest=0) {
+		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		$pi=pathinfo($remotefile);
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
+		else $mode=FTP_BINARY;
+		if(!$this->_data_prepare($mode)) {
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if(!$this->_exec("RETR ".$remotefile, "get")) {
+			$this->_data_close();
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			$this->_data_close();
+			return FALSE;
+		}
+		$out=$this->_data_read($mode, $fp);
+		$this->_data_close();
+		if(!$this->_readmsg()) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return $out;
+	}
+
+	function get($remotefile, $localfile=NULL, $rest=0) {
+		if(is_null($localfile)) $localfile=$remotefile;
+		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
+		$fp = @fopen($localfile, "w");
+		if (!$fp) {
+			$this->PushError("get","can't open local file", "Cannot create \"".$localfile."\"");
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		$pi=pathinfo($remotefile);
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
+		else $mode=FTP_BINARY;
+		if(!$this->_data_prepare($mode)) {
+			fclose($fp);
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if(!$this->_exec("RETR ".$remotefile, "get")) {
+			$this->_data_close();
+			fclose($fp);
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			$this->_data_close();
+			fclose($fp);
+			return FALSE;
+		}
+		$out=$this->_data_read($mode, $fp);
+		fclose($fp);
+		$this->_data_close();
+		if(!$this->_readmsg()) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return $out;
+	}
+
+	function fput($remotefile, $fp) {
+		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		$pi=pathinfo($remotefile);
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
+		else $mode=FTP_BINARY;
+		if(!$this->_data_prepare($mode)) {
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if(!$this->_exec("STOR ".$remotefile, "put")) {
+			$this->_data_close();
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			$this->_data_close();
+			return FALSE;
+		}
+		$ret=$this->_data_write($mode, $fp);
+		$this->_data_close();
+		if(!$this->_readmsg()) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return $ret;
+	}
+
+	function put($localfile, $remotefile=NULL, $rest=0) {
+		if(is_null($remotefile)) $remotefile=$localfile;
+		if (!file_exists($localfile)) {
+			$this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\"");
+			return FALSE;
+		}
+		$fp = @fopen($localfile, "r");
+
+		if (!$fp) {
+			$this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\"");
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		$pi=pathinfo($localfile);
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
+		else $mode=FTP_BINARY;
+		if(!$this->_data_prepare($mode)) {
+			fclose($fp);
+			return FALSE;
+		}
+		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if(!$this->_exec("STOR ".$remotefile, "put")) {
+			$this->_data_close();
+			fclose($fp);
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			$this->_data_close();
+			fclose($fp);
+			return FALSE;
+		}
+		$ret=$this->_data_write($mode, $fp);
+		fclose($fp);
+		$this->_data_close();
+		if(!$this->_readmsg()) return FALSE;
+		if(!$this->_checkCode()) return FALSE;
+		return $ret;
+	}
+
+	function mput($local=".", $remote=NULL, $continious=false) {
+		$local=realpath($local);
+		if(!@file_exists($local)) {
+			$this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\"");
+			return FALSE;
+		}
+		if(!is_dir($local)) return $this->put($local, $remote);
+		if(empty($remote)) $remote=".";
+		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
+		if($handle = opendir($local)) {
+			$list=array();
+			while (false !== ($file = readdir($handle))) {
+				if ($file != "." && $file != "..") $list[]=$file;
+			}
+			closedir($handle);
+		} else {
+			$this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\"");
+			return FALSE;
+		}
+		if(empty($list)) return TRUE;
+		$ret=true;
+		foreach($list as $el) {
+			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
+			else $t=$this->put($local."/".$el, $remote."/".$el);
+			if(!$t) {
+				$ret=FALSE;
+				if(!$continious) break;
+			}
+		}
+		return $ret;
+
+	}
+
+	function mget($remote, $local=".", $continious=false) {
+		$list=$this->rawlist($remote, "-lA");
+		if($list===false) {
+			$this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+			return FALSE;
+		}
+		if(empty($list)) return true;
+		if(!@file_exists($local)) {
+			if(!@mkdir($local)) {
+				$this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\"");
+				return FALSE;
+			}
+		}
+		foreach($list as $k=>$v) {
+			$list[$k]=$this->parselisting($v);
+			if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+		}
+		$ret=true;
+		foreach($list as $el) {
+			if($el["type"]=="d") {
+				if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
+					$this->PushError("mget", "can't copy folder", "Can't copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
+					$ret=false;
+					if(!$continious) break;
+				}
+			} else {
+				if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) {
+					$this->PushError("mget", "can't copy file", "Can't copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
+					$ret=false;
+					if(!$continious) break;
+				}
+			}
+			@chmod($local."/".$el["name"], $el["perms"]);
+			$t=strtotime($el["date"]);
+			if($t!==-1 and $t!==false) @touch($local."/".$el["name"], $t);
+		}
+		return $ret;
+	}
+
+	function mdel($remote, $continious=false) {
+		$list=$this->rawlist($remote, "-la");
+		if($list===false) {
+			$this->PushError("mdel","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+			return false;
+		}
+
+		foreach($list as $k=>$v) {
+			$list[$k]=$this->parselisting($v);
+			if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+		}
+		$ret=true;
+
+		foreach($list as $el) {
+			if ( empty($el) )
+				continue;
+
+			if($el["type"]=="d") {
+				if(!$this->mdel($remote."/".$el["name"], $continious)) {
+					$ret=false;
+					if(!$continious) break;
+				}
+			} else {
+				if (!$this->delete($remote."/".$el["name"])) {
+					$this->PushError("mdel", "can't delete file", "Can't delete remote file \"".$remote."/".$el["name"]."\"");
+					$ret=false;
+					if(!$continious) break;
+				}
+			}
+		}
+
+		if(!$this->rmdir($remote)) {
+			$this->PushError("mdel", "can't delete folder", "Can't delete remote folder \"".$remote."/".$el["name"]."\"");
+			$ret=false;
+		}
+		return $ret;
+	}
+
+	function mmkdir($dir, $mode = 0777) {
+		if(empty($dir)) return FALSE;
+		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
+		if(!$this->mmkdir(dirname($dir), $mode)) return false;
+		$r=$this->mkdir($dir, $mode);
+		$this->chmod($dir,$mode);
+		return $r;
+	}
+
+	function glob($pattern, $handle=NULL) {
+		$path=$output=null;
+		if(PHP_OS=='WIN32') $slash='\\';
+		else $slash='/';
+		$lastpos=strrpos($pattern,$slash);
+		if(!($lastpos===false)) {
+			$path=substr($pattern,0,-$lastpos-1);
+			$pattern=substr($pattern,$lastpos);
+		} else $path=getcwd();
+		if(is_array($handle) and !empty($handle)) {
+			while($dir=each($handle)) {
+				if($this->glob_pattern_match($pattern,$dir))
+				$output[]=$dir;
+			}
+		} else {
+			$handle=@opendir($path);
+			if($handle===false) return false;
+			while($dir=readdir($handle)) {
+				if($this->glob_pattern_match($pattern,$dir))
+				$output[]=$dir;
+			}
+			closedir($handle);
+		}
+		if(is_array($output)) return $output;
+		return false;
+	}
+
+	function glob_pattern_match($pattern,$string) {
+		$out=null;
+		$chunks=explode(';',$pattern);
+		foreach($chunks as $pattern) {
+			$escape=array('$','^','.','{','}','(',')','[',']','|');
+			while(strpos($pattern,'**')!==false)
+				$pattern=str_replace('**','*',$pattern);
+			foreach($escape as $probe)
+				$pattern=str_replace($probe,"\\$probe",$pattern);
+			$pattern=str_replace('?*','*',
+				str_replace('*?','*',
+					str_replace('*',".*",
+						str_replace('?','.{1,1}',$pattern))));
+			$out[]=$pattern;
+		}
+		if(count($out)==1) return($this->glob_regexp("^$out[0]$",$string));
+		else {
+			foreach($out as $tester)
+				if($this->my_regexp("^$tester$",$string)) return true;
+		}
+		return false;
+	}
+
+	function glob_regexp($pattern,$probe) {
+		$sensitive=(PHP_OS!='WIN32');
+		return ($sensitive?
+			ereg($pattern,$probe):
+			eregi($pattern,$probe)
+		);
+	}
+
+	function dirlist($remote) {
+		$list=$this->rawlist($remote, "-la");
+		if($list===false) {
+			$this->PushError("dirlist","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
+			return false;
+		}
+
+		$dirlist = array();
+		foreach($list as $k=>$v) {
+			$entry=$this->parselisting($v);
+			if ( empty($entry) )
+				continue;
+
+			if($entry["name"]=="." or $entry["name"]=="..")
+				continue;
+
+			$dirlist[$entry['name']] = $entry;
+		}
+
+		return $dirlist;
+	}
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!--       Private functions                                                                 -->
+// <!-- --------------------------------------------------------------------------------------- -->
+	function _checkCode() {
+		return ($this->_code<400 and $this->_code>0);
+	}
+
+	function _list($arg="", $cmd="LIST", $fnction="_list") {
+		if(!$this->_data_prepare()) return false;
+		if(!$this->_exec($cmd.$arg, $fnction)) {
+			$this->_data_close();
+			return FALSE;
+		}
+		if(!$this->_checkCode()) {
+			$this->_data_close();
+			return FALSE;
+		}
+		$out="";
+		if($this->_code<200) {
+			$out=$this->_data_read();
+			$this->_data_close();
+			if(!$this->_readmsg()) return FALSE;
+			if(!$this->_checkCode()) return FALSE;
+			if($out === FALSE ) return FALSE;
+			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
+//			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
+		}
+		return $out;
+	}
+
+// <!-- --------------------------------------------------------------------------------------- -->
+// <!-- Partie : gestion des erreurs                                                            -->
+// <!-- --------------------------------------------------------------------------------------- -->
+// Gnre une erreur pour traitement externe  la classe
+	function PushError($fctname,$msg,$desc=false){
+		$error=array();
+		$error['time']=time();
+		$error['fctname']=$fctname;
+		$error['msg']=$msg;
+		$error['desc']=$desc;
+		if($desc) $tmp=' ('.$desc.')'; else $tmp='';
+		$this->SendMSG($fctname.': '.$msg.$tmp);
+		return(array_push($this->_error_array,$error));
+	}
+
+// Rcupre une erreur externe
+	function PopError(){
+		if(count($this->_error_array)) return(array_pop($this->_error_array));
+			else return(false);
+	}
+}
+
+$mod_sockets=TRUE;
+if (!extension_loaded('sockets')) {
+	$prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
+	if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE;
+}
+
+require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php";
+?>
diff -uNr a/mp-wp/wp-admin/includes/class-pclzip.php b/mp-wp/wp-admin/includes/class-pclzip.php
--- a/mp-wp/wp-admin/includes/class-pclzip.php false
+++ b/mp-wp/wp-admin/includes/class-pclzip.php 00f67e82c1c9704c47e73c6ef538b2a3859b0e79a9c39e74b0bfa5ff2e2aa11db6ac811f8a0702f08ed373846f650ecec2c2224c72ada4bd67a7cb6a818ca3df
@@ -0,0 +1,5759 @@
+<?php
+/**
+ * PhpConcept Library - Zip Module 2.5
+ *
+ * Presentation :
+ *   PclZip is a PHP library that manage ZIP archives.
+ *   So far tests show that archives generated by PclZip are readable by
+ *   WinZip application and other tools.
+ *
+ * Warning :
+ *   This library and the associated files are non commercial, non professional
+ *   work.
+ *   It should not have unexpected results. However if any damage is caused by
+ *   this software the author can not be responsible.
+ *   The use of this software is at the risk of the user.
+ *
+ * @package External
+ * @subpackage PclZip
+ *
+ * @license License GNU/LGPL
+ * @copyright March 2006 Vincent Blavet
+ * @author Vincent Blavet
+ * @link http://www.phpconcept.net
+ * @version $Id: pclzip.lib.php,v 1.44 2006/03/08 21:23:59 vblavet Exp $
+ */
+
+/**
+ * The read block size for reading zip files.
+ *
+ * @since 2.5
+ */
+define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+
+/**
+ * File list separator
+ *
+ * In version 1.x of PclZip, the separator for file list is a space(which is not
+ * a very smart choice, specifically for windows paths !). A better separator
+ * should be a comma (,). This constant gives you the abilty to change that.
+ *
+ * However notice that changing this value, may have impact on existing scripts,
+ * using space separated filenames. Recommanded values for compatibility with
+ * older versions :
+ * <code>define( 'PCLZIP_SEPARATOR', ' ' );</code>
+ * Recommanded values for smart separation of filenames.
+ */
+define( 'PCLZIP_SEPARATOR', ',' );
+
+/**
+ * Error configuration
+ *
+ * 0 : PclZip Class integrated error handling
+ * 1 : PclError external library error handling. By enabling this you must
+ *     ensure that you have included PclError library.
+ * [2,...] : reserved for future use
+ */
+define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+
+  // ----- Optional static temporary directory
+  //       By default temporary files are generated in the script current
+  //       path.
+  //       If defined :
+  //       - MUST BE terminated by a '/'.
+  //       - MUST be a valid, already created directory
+  //       Samples :
+  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+  define( 'PCLZIP_TEMPORARY_DIR', '' );
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
+// --------------------------------------------------------------------------------
+
+  // ----- Global variables
+  $g_pclzip_version = "2.5";
+
+  // ----- Error codes
+  //   -1 : Unable to open file in binary write mode
+  //   -2 : Unable to open file in binary read mode
+  //   -3 : Invalid parameters
+  //   -4 : File does not exist
+  //   -5 : Filename is too long (max. 255)
+  //   -6 : Not a valid zip file
+  //   -7 : Invalid extracted file size
+  //   -8 : Unable to create directory
+  //   -9 : Invalid archive extension
+  //  -10 : Invalid archive format
+  //  -11 : Unable to delete file (unlink)
+  //  -12 : Unable to rename file (rename)
+  //  -13 : Invalid header checksum
+  //  -14 : Invalid archive size
+  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
+  define( 'PCLZIP_ERR_NO_ERROR', 0 );
+  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
+  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
+  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
+  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
+  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
+  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
+  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
+  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
+  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
+  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
+  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
+  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
+  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
+  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
+  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
+  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
+  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
+  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
+  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
+  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
+  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+
+  // ----- Options values
+  define( 'PCLZIP_OPT_PATH', 77001 );
+  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
+  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
+  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
+  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
+  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
+  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
+  define( 'PCLZIP_OPT_BY_NAME', 77008 );
+  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
+  define( 'PCLZIP_OPT_BY_EREG', 77010 );
+  define( 'PCLZIP_OPT_BY_PREG', 77011 );
+  define( 'PCLZIP_OPT_COMMENT', 77012 );
+  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
+  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
+  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
+  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
+  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  // Having big trouble with crypt. Need to multiply 2 long int
+  // which is not correctly supported by PHP ...
+  //define( 'PCLZIP_OPT_CRYPT', 77018 );
+  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
+
+  // ----- File description attributes
+  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
+  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
+  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
+
+  // ----- Call backs values
+  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
+  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
+  define( 'PCLZIP_CB_PRE_ADD', 78003 );
+  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  /* For future use
+  define( 'PCLZIP_CB_PRE_LIST', 78005 );
+  define( 'PCLZIP_CB_POST_LIST', 78006 );
+  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+  define( 'PCLZIP_CB_POST_DELETE', 78008 );
+  */
+
+  // --------------------------------------------------------------------------------
+  // Class : PclZip
+  // Description :
+  //   PclZip is the class that represent a Zip archive.
+  //   The public methods allow the manipulation of the archive.
+  // Attributes :
+  //   Attributes must not be accessed directly.
+  // Methods :
+  //   PclZip() : Object creator
+  //   create() : Creates the Zip archive
+  //   listContent() : List the content of the Zip archive
+  //   extract() : Extract the content of the archive
+  //   properties() : List the properties of the archive
+  // --------------------------------------------------------------------------------
+  class PclZip
+  {
+    // ----- Filename of the zip file
+    var $zipname = '';
+
+    // ----- File descriptor of the zip file
+    var $zip_fd = 0;
+
+    // ----- Internal error handling
+    var $error_code = 1;
+    var $error_string = '';
+
+    // ----- Current status of the magic_quotes_runtime
+    // This value store the php configuration for magic_quotes
+    // The class can then disable the magic_quotes and reset it after
+    var $magic_quotes_status;
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZip()
+  // Description :
+  //   Creates a PclZip object and set the name of the associated Zip archive
+  //   filename.
+  //   Note that no real action is taken, if the archive does not exist it is not
+  //   created. Use create() for that.
+  // --------------------------------------------------------------------------------
+  function PclZip($p_zipname)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::PclZip', "zipname=$p_zipname");
+
+    // ----- Tests the zlib
+    if (!function_exists('gzopen'))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 1, "zlib extension seems to be missing");
+      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+    }
+
+    // ----- Set the attributes
+    $this->zipname = $p_zipname;
+    $this->zip_fd = 0;
+    $this->magic_quotes_status = -1;
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 1);
+    return;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   create($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two different synopsis. The first one is historical.
+  //   This method creates a Zip Archive. The Zip file is created in the
+  //   filesystem. The files and directories indicated in $p_filelist
+  //   are added in the archive. See the parameters description for the
+  //   supported format of $p_filelist.
+  //   When a directory is in the list, the directory and its content is added
+  //   in the archive.
+  //   In this synopsis, the function takes an optional variable list of
+  //   options. See bellow the supported options.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function create($p_filelist)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::create', "filelist='$p_filelist', ...");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove from the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected");
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_ADD => 'optional',
+                                                   PCLZIP_CB_POST_ADD => 'optional',
+                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                                                   PCLZIP_OPT_COMMENT => 'optional'
+                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+                                             ));
+        if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+          return 0;
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                       "Invalid number / type of arguments");
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return 0;
+        }
+      }
+    }
+
+    // ----- Init
+    $v_string_list = array();
+    $v_att_list = array();
+    $v_filedescr_list = array();
+    $p_result_list = array();
+
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+      }
+
+      // ----- The list is a list of string names
+      else {
+        $v_string_list = $p_filelist;
+      }
+    }
+
+    // ----- Look if the $p_filelist is a string
+    else if (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+    }
+
+    // ----- Invalid variable type for $p_filelist
+    else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        if ($v_string != '') {
+          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Ignore an empty filename");
+        }
+      }
+    }
+
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes
+    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+						);
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry,
+                                               $v_filedescr_list[],
+                                               $v_options,
+                                               $v_supported_attributes);
+      if ($v_result != 1) {
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   add($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This methods add the list of files in an existing archive.
+  //   If a file with the same name already exists, it is added at the end of the
+  //   archive, the first one is still present.
+  //   If the archive does not exist, it is created.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_OPT_ADD_COMMENT :
+  //   PCLZIP_OPT_PREPEND_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function add($p_filelist)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::add', "filelist='$p_filelist', ...");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options detected");
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_ADD => 'optional',
+                                                   PCLZIP_CB_POST_ADD => 'optional',
+                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                                                   PCLZIP_OPT_COMMENT => 'optional',
+                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
+                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional'
+                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+												   ));
+        if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+          return 0;
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return 0;
+        }
+      }
+    }
+
+    // ----- Init
+    $v_string_list = array();
+    $v_att_list = array();
+    $v_filedescr_list = array();
+    $p_result_list = array();
+
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+      }
+
+      // ----- The list is a list of string names
+      else {
+        $v_string_list = $p_filelist;
+      }
+    }
+
+    // ----- Look if the $p_filelist is a string
+    else if (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+    }
+
+    // ----- Invalid variable type for $p_filelist
+    else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+      }
+    }
+
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes
+    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+						);
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry,
+                                               $v_filedescr_list[],
+                                               $v_options,
+                                               $v_supported_attributes);
+      if ($v_result != 1) {
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return 0;
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_result_list);
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : listContent()
+  // Description :
+  //   This public method, gives the list of the files and directories, with their
+  //   properties.
+  //   The properties of each entries in the list are (used also in other functions) :
+  //     filename : Name of the file. For a create or add action it is the filename
+  //                given by the user. For an extract function it is the filename
+  //                of the extracted file.
+  //     stored_filename : Name of the file / directory stored in the archive.
+  //     size : Size of the stored file.
+  //     compressed_size : Size of the file's data compressed in the archive
+  //                       (without the headers overhead)
+  //     mtime : Last known modification date of the file (UNIX timestamp)
+  //     comment : Comment associated with the file
+  //     folder : true | false
+  //     index : index of the file in the archive
+  //     status : status of the action (depending of the action) :
+  //              Values are :
+  //                ok : OK !
+  //                filtered : the file / dir is not extracted (filtered by user)
+  //                already_a_directory : the file can not be extracted because a
+  //                                      directory with the same name already exists
+  //                write_protected : the file can not be extracted because a file
+  //                                  with the same name already exists and is
+  //                                  write protected
+  //                newer_exist : the file was not extracted because a newer file exists
+  //                path_creation_fail : the file is not extracted because the folder
+  //                                     does not exists and can not be created
+  //                write_error : the file was not extracted because there was a
+  //                              error while writing the file
+  //                read_error : the file was not extracted because there was a error
+  //                             while reading the file
+  //                invalid_header : the file was not extracted because of an archive
+  //                                 format error (bad file header)
+  //   Note that each time a method can continue operating when there
+  //   is an action error on a file, the error is only logged in the file status.
+  // Return Values :
+  //   0 on an unrecoverable failure,
+  //   The list of the files in the archive.
+  // --------------------------------------------------------------------------------
+  function listContent()
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::listContent', "");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Call the extracting fct
+    $p_list = array();
+    if (($v_result = $this->privList($p_list)) != 1)
+    {
+      unset($p_list);
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
+      return(0);
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extract($p_path="./", $p_remove_path="")
+  //   extract([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method extract all the files / directories from the archive to the
+  //   folder indicated in $p_path.
+  //   If you want to ignore the 'root' part of path of the memorized files
+  //   you can indicate this in the optional $p_remove_path parameter.
+  //   By default, if a newer file with the same name already exists, the
+  //   file is not extracted.
+  //
+  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+  //   at the end of the path value of PCLZIP_OPT_PATH.
+  // Parameters :
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 or a negative value on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function extract()
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extract", "");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+//    $v_path = "./";
+    $v_path = '';
+    $v_remove_path = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options");
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
+                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
+                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
+                                                   PCLZIP_OPT_BY_NAME => 'optional',
+                                                   PCLZIP_OPT_BY_EREG => 'optional',
+                                                   PCLZIP_OPT_BY_PREG => 'optional',
+                                                   PCLZIP_OPT_BY_INDEX => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional'
+												    ));
+        if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
+          return 0;
+        }
+      }
+    }
+
+    // ----- Trace
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'");
+
+    // ----- Call the extracting fct
+    $p_list = array();
+    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+	                                     $v_remove_all_path, $v_options);
+    if ($v_result < 1) {
+      unset($p_list);
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
+      return(0);
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method is doing a partial extract of the archive.
+  //   The extracted files or folders are identified by their index in the
+  //   archive (from 0 to n).
+  //   Note that if the index identify a folder, only the folder entry is
+  //   extracted, not all the files included in the archive.
+  // Parameters :
+  //   $p_index : A single index (integer) or a string of indexes of files to
+  //              extract. The form of the string is "0,4-6,8-12" with only numbers
+  //              and '-' for range or ',' to separate ranges. No spaces or ';'
+  //              are allowed.
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+  //     not as files.
+  //     The resulting content is in a new field 'content' in the file
+  //     structure.
+  //     This option must be used alone (any other options are ignored).
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  //function extractByIndex($p_index, options...)
+  function extractByIndex($p_index)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::extractByIndex", "index='$p_index', ...");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+//    $v_path = "./";
+    $v_path = '';
+    $v_remove_path = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Variable list of options");
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
+                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
+                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
+                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional'
+												   ));
+        if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING not set.");
+        }
+        else {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING set.");
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Static synopsis");
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return 0;
+        }
+      }
+    }
+
+    // ----- Trace
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "index='$p_index', path='$v_path', remove_path='$v_remove_path', remove_all_path='".($v_remove_path?'true':'false')."'");
+
+    // ----- Trick
+    // Here I want to reuse extractByRule(), so I need to parse the $p_index
+    // with privParseOptions()
+    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_options_trick = array();
+    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
+                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+    if ($v_result != 1) {
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+        return 0;
+    }
+    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+    // ----- Call the extracting fct
+    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
+        return(0);
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   delete([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method removes files from the archive.
+  //   If no parameters are given, then all the archive is emptied.
+  // Parameters :
+  //   None or optional arguments.
+  // Options :
+  //   PCLZIP_OPT_BY_INDEX :
+  //   PCLZIP_OPT_BY_NAME :
+  //   PCLZIP_OPT_BY_EREG :
+  //   PCLZIP_OPT_BY_PREG :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the files which are still present in the archive.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function delete()
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::delete", "");
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Parse the options
+      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                               PCLZIP_OPT_BY_EREG => 'optional',
+                                               PCLZIP_OPT_BY_PREG => 'optional',
+                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+      if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+          return 0;
+      }
+    }
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Call the delete fct
+    $v_list = array();
+    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+      $this->privSwapBackMagicQuotes();
+      unset($v_list);
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0, PclZip::errorInfo());
+      return(0);
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_list);
+    return $v_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : deleteByIndex()
+  // Description :
+  //   ***** Deprecated *****
+  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+  // --------------------------------------------------------------------------------
+  function deleteByIndex($p_index)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::deleteByIndex", "index='$p_index'");
+
+    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $p_list);
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : properties()
+  // Description :
+  //   This method gives the properties of the archive.
+  //   The properties are :
+  //     nb : Number of files in the archive
+  //     comment : Comment associated with the archive file
+  //     status : not_exist, ok
+  // Parameters :
+  //   None
+  // Return Values :
+  //   0 on failure,
+  //   An array with the archive properties.
+  // --------------------------------------------------------------------------------
+  function properties()
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::properties", "");
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      $this->privSwapBackMagicQuotes();
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Default properties
+    $v_prop = array();
+    $v_prop['comment'] = '';
+    $v_prop['nb'] = 0;
+    $v_prop['status'] = 'not_exist';
+
+    // ----- Look if file exists
+    if (@is_file($this->zipname))
+    {
+      // ----- Open the zip file
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
+      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+      {
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), 0);
+        return 0;
+      }
+
+      // ----- Read the central directory informations
+      $v_central_dir = array();
+      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+      {
+        $this->privSwapBackMagicQuotes();
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+        return 0;
+      }
+
+      // ----- Close the zip file
+      $this->privCloseFd();
+
+      // ----- Set the user attributes
+      $v_prop['comment'] = $v_central_dir['comment'];
+      $v_prop['nb'] = $v_central_dir['entries'];
+      $v_prop['status'] = 'ok';
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_prop);
+    return $v_prop;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : duplicate()
+  // Description :
+  //   This method creates an archive by copying the content of an other one. If
+  //   the archive already exist, it is replaced by the new one without any warning.
+  // Parameters :
+  //   $p_archive : The filename of a valid archive, or
+  //                a valid PclZip object.
+  // Return Values :
+  //   1 on success.
+  //   0 or a negative value on error (error code).
+  // --------------------------------------------------------------------------------
+  function duplicate($p_archive)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::duplicate", "");
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the $p_archive is a PclZip object
+    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is valid PclZip object '".$p_archive->zipname."'");
+
+      // ----- Duplicate the archive
+      $v_result = $this->privDuplicate($p_archive->zipname);
+    }
+
+    // ----- Look if the $p_archive is a string (so a filename)
+    else if (is_string($p_archive))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The parameter is a filename '$p_archive'");
+
+      // ----- Check that $p_archive is a valid zip file
+      // TBC : Should also check the archive format
+      if (!is_file($p_archive)) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+        $v_result = PCLZIP_ERR_MISSING_FILE;
+      }
+      else {
+        // ----- Duplicate the archive
+        $v_result = $this->privDuplicate($p_archive);
+      }
+    }
+
+    // ----- Invalid variable
+    else
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : merge()
+  // Description :
+  //   This method merge the $p_archive_to_add archive at the end of the current
+  //   one ($this).
+  //   If the archive ($this) does not exist, the merge becomes a duplicate.
+  //   If the $p_archive_to_add archive does not exist, the merge is a success.
+  // Parameters :
+  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+  //                       or a PclZip object archive.
+  // Return Values :
+  //   1 on success,
+  //   0 or negative values on error (see below).
+  // --------------------------------------------------------------------------------
+  function merge($p_archive_to_add)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::merge", "");
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, 0);
+      return(0);
+    }
+
+    // ----- Look if the $p_archive_to_add is a PclZip object
+    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is valid PclZip object");
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($p_archive_to_add);
+    }
+
+    // ----- Look if the $p_archive_to_add is a string (so a filename)
+    else if (is_string($p_archive_to_add))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The parameter is a filename");
+
+      // ----- Create a temporary archive
+      $v_object_archive = new PclZip($p_archive_to_add);
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($v_object_archive);
+    }
+
+    // ----- Invalid variable
+    else
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+
+
+  // --------------------------------------------------------------------------------
+  // Function : errorCode()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorCode()
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return(PclErrorCode());
+    }
+    else {
+      return($this->error_code);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorName()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorName($p_with_code=false)
+  {
+    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
+                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
+                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+                    );
+
+    if (isset($v_name[$this->error_code])) {
+      $v_value = $v_name[$this->error_code];
+    }
+    else {
+      $v_value = 'NoName';
+    }
+
+    if ($p_with_code) {
+      return($v_value.' ('.$this->error_code.')');
+    }
+    else {
+      return($v_value);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorInfo()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorInfo($p_full=false)
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return(PclErrorString());
+    }
+    else {
+      if ($p_full) {
+        return($this->errorName(true)." : ".$this->error_string);
+      }
+      else {
+        return($this->error_string." [code ".$this->error_code."]");
+      }
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+// *****                                                        *****
+// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+// --------------------------------------------------------------------------------
+
+
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFormat()
+  // Description :
+  //   This method check that the archive exists and is a valid zip archive.
+  //   Several level of check exists. (futur)
+  // Parameters :
+  //   $p_level : Level of check. Default 0.
+  //              0 : Check the first bytes (magic codes) (default value))
+  //              1 : 0 + Check the central directory (futur)
+  //              2 : 1 + Check each file header (futur)
+  // Return Values :
+  //   true on success,
+  //   false on error, the error code is set.
+  // --------------------------------------------------------------------------------
+  function privCheckFormat($p_level=0)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCheckFormat", "");
+    $v_result = true;
+
+	// ----- Reset the file system cache
+    clearstatcache();
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the file exits
+    if (!is_file($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo());
+      return(false);
+    }
+
+    // ----- Check that the file is readeable
+    if (!is_readable($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, false, PclZip::errorInfo());
+      return(false);
+    }
+
+    // ----- Check the magic code
+    // TBC
+
+    // ----- Check the central header
+    // TBC
+
+    // ----- Check each file header
+    // TBC
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privParseOptions()
+  // Description :
+  //   This internal methods reads the variable list of arguments ($p_options_list,
+  //   $p_size) and generate an array with the options and values ($v_result_list).
+  //   $v_requested_options contains the options that can be present and those that
+  //   must be present.
+  //   $v_requested_options is an array, with the option value as key, and 'optional',
+  //   or 'mandatory' as value.
+  // Parameters :
+  //   See above.
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privParseOptions", "");
+    $v_result=1;
+
+    // ----- Read the options
+    $i=0;
+    while ($i<$p_size) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Looking for table index $i, option = '".PclZipUtilOptionText($p_options_list[$i])."(".$p_options_list[$i].")'");
+
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$p_options_list[$i]])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for next option
+      switch ($p_options_list[$i]) {
+        // ----- Look for options that request a path value
+        case PCLZIP_OPT_PATH :
+        case PCLZIP_OPT_REMOVE_PATH :
+        case PCLZIP_OPT_ADD_PATH :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+          $i++;
+        break;
+
+        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (   is_string($p_options_list[$i+1])
+              && ($p_options_list[$i+1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+            $i++;
+          }
+          else {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." set with an empty value is ignored.");
+          }
+        break;
+
+        // ----- Look for options that request an array of string for value
+        case PCLZIP_OPT_BY_NAME :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          }
+          else if (is_array($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+          ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+          $i++;
+        break;
+
+        // ----- Look for options that request an EREG or PREG expression
+        case PCLZIP_OPT_BY_EREG :
+        case PCLZIP_OPT_BY_PREG :
+        //case PCLZIP_OPT_CRYPT :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+          $i++;
+        break;
+
+        // ----- Look for options that takes a string
+        case PCLZIP_OPT_COMMENT :
+        case PCLZIP_OPT_ADD_COMMENT :
+        case PCLZIP_OPT_PREPEND_COMMENT :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
+			                     "Missing parameter value for option '"
+								 .PclZipUtilOptionText($p_options_list[$i])
+								 ."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
+			                     "Wrong parameter value for option '"
+								 .PclZipUtilOptionText($p_options_list[$i])
+								 ."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+          $i++;
+        break;
+
+        // ----- Look for options that request an array of index
+        case PCLZIP_OPT_BY_INDEX :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_work_list = array();
+          if (is_string($p_options_list[$i+1])) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is a string '".$p_options_list[$i+1]."'");
+
+              // ----- Remove spaces
+              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+
+              // ----- Parse items
+              $v_work_list = explode(",", $p_options_list[$i+1]);
+          }
+          else if (is_integer($p_options_list[$i+1])) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an integer '".$p_options_list[$i+1]."'");
+              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+          }
+          else if (is_array($p_options_list[$i+1])) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Index value is an array");
+              $v_work_list = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Reduce the index list
+          // each index item in the list must be a couple with a start and
+          // an end value : [0,3], [5-5], [8-10], ...
+          // ----- Check the format of each item
+          $v_sort_flag=false;
+          $v_sort_value=0;
+          for ($j=0; $j<sizeof($v_work_list); $j++) {
+              // ----- Explode the item
+              $v_item_list = explode("-", $v_work_list[$j]);
+              $v_size_item_list = sizeof($v_item_list);
+
+              // ----- TBC : Here we might check that each item is a
+              // real integer ...
+
+              // ----- Look for single value
+              if ($v_size_item_list == 1) {
+                  // ----- Set the option value
+                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
+              }
+              elseif ($v_size_item_list == 2) {
+                  // ----- Set the option value
+                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
+              }
+              else {
+                  // ----- Error log
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                  // ----- Return
+                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+                  return PclZip::errorCode();
+              }
+
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extracted index item = [".$v_result_list[$p_options_list[$i]][$j]['start'].",".$v_result_list[$p_options_list[$i]][$j]['end']."]");
+
+              // ----- Look for list sort
+              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The list should be sorted ...");
+                  $v_sort_flag=true;
+
+                  // ----- TBC : An automatic sort should be writen ...
+                  // ----- Error log
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                  // ----- Return
+                  //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+                  return PclZip::errorCode();
+              }
+              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+          }
+
+          // ----- Sort the items
+          if ($v_sort_flag) {
+              // TBC : To Be Completed
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "List sorting is not yet write ...");
+          }
+
+          // ----- Next option
+          $i++;
+        break;
+
+        // ----- Look for options that request no value
+        case PCLZIP_OPT_REMOVE_ALL_PATH :
+        case PCLZIP_OPT_EXTRACT_AS_STRING :
+        case PCLZIP_OPT_NO_COMPRESSION :
+        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
+        case PCLZIP_OPT_REPLACE_NEWER :
+        case PCLZIP_OPT_STOP_ON_ERROR :
+          $v_result_list[$p_options_list[$i]] = true;
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+        break;
+
+        // ----- Look for options that request an octal value
+        case PCLZIP_OPT_SET_CHMOD :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
+          $i++;
+        break;
+
+        // ----- Look for options that request a call-back
+        case PCLZIP_CB_PRE_EXTRACT :
+        case PCLZIP_CB_POST_EXTRACT :
+        case PCLZIP_CB_PRE_ADD :
+        case PCLZIP_CB_POST_ADD :
+        /* for futur use
+        case PCLZIP_CB_PRE_DELETE :
+        case PCLZIP_CB_POST_DELETE :
+        case PCLZIP_CB_PRE_LIST :
+        case PCLZIP_CB_POST_LIST :
+        */
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_function_name = $p_options_list[$i+1];
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "call-back ".PclZipUtilOptionText($p_options_list[$i])." = '".$v_function_name."'");
+
+          // ----- Check that the value is a valid existing function
+          if (!function_exists($v_function_name)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          // ----- Set the attribute
+          $v_result_list[$p_options_list[$i]] = $v_function_name;
+          $i++;
+        break;
+
+        default :
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                       "Unknown parameter '"
+							   .$p_options_list[$i]."'");
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return PclZip::errorCode();
+      }
+
+      // ----- Next options
+      $i++;
+    }
+
+    // ----- Look for mandatory options
+    if ($v_requested_options !== false) {
+      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        // ----- Look for mandatory option
+        if ($v_requested_options[$key] == 'mandatory') {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
+          // ----- Look if present
+          if (!isset($v_result_list[$key])) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+        }
+      }
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrParseAtt()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrParseAtt", "");
+    $v_result=1;
+
+    // ----- For each file in the list check the attributes
+    foreach ($p_file_list as $v_key => $v_value) {
+
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$v_key])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for attribute
+      switch ($v_key) {
+        case PCLZIP_ATT_FILE_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
+
+          if ($p_filedescr['filename'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+        break;
+
+        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
+
+          if ($p_filedescr['new_short_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+        break;
+
+        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
+
+          if ($p_filedescr['new_full_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+          }
+        break;
+
+        default :
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                           "Unknown parameter '".$v_key."'");
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return PclZip::errorCode();
+      }
+
+      // ----- Look for mandatory options
+      if ($v_requested_options !== false) {
+        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+          // ----- Look for mandatory option
+          if ($v_requested_options[$key] == 'mandatory') {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Detect a mandatory option : ".PclZipUtilOptionText($key)."(".$key.")");
+            // ----- Look if present
+            if (!isset($p_file_list[$key])) {
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+              return PclZip::errorCode();
+            }
+          }
+        }
+      }
+
+    // end foreach
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrExpand()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrExpand", "");
+    $v_result=1;
+
+    // ----- Create a result list
+    $v_result_list = array();
+
+    // ----- Look each entry
+    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+      // ----- Get filedescr
+      $v_descr = $p_filedescr_list[$i];
+
+      // ----- Reduce the filename
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr before reduction :'".$v_descr['filename']."'");
+      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename']);
+      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr after reduction :'".$v_descr['filename']."'");
+
+      // ----- Get type of descr
+      if (!file_exists($v_descr['filename'])) {
+        // ----- Error log
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$v_descr['filename']."' does not exists");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exists");
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+      if (@is_file($v_descr['filename'])) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "This is a file");
+        $v_descr['type'] = 'file';
+      }
+      else if (@is_dir($v_descr['filename'])) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "This is a folder");
+        $v_descr['type'] = 'folder';
+      }
+      else if (@is_link($v_descr['filename'])) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Unsupported file type : link");
+        // skip
+        continue;
+      }
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Unsupported file type : unknown type");
+        // skip
+        continue;
+      }
+
+      // ----- Calculate the stored filename
+      $this->privCalculateStoredFilename($v_descr, $p_options);
+
+      // ----- Add the descriptor in result list
+      $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+      // ----- Look for folder
+      if ($v_descr['type'] == 'folder') {
+        // ----- List of items in folder
+        $v_dirlist_descr = array();
+        $v_dirlist_nb = 0;
+        if ($v_folder_handler = @opendir($v_descr['filename'])) {
+          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for '".$v_item_handler."' in the directory");
+
+            // ----- Skip '.' and '..'
+            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                continue;
+            }
+
+            // ----- Compose the full filename
+            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+
+            // ----- Look for different stored filename
+            // Because the name of the folder was changed, the name of the
+            // files/sub-folders also change
+            if ($v_descr['stored_filename'] != $v_descr['filename']) {
+              $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+            }
+
+            $v_dirlist_nb++;
+          }
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to open dir '".$v_descr['filename']."' in read mode. Skipped.");
+          // TBC : unable to open folder in read mode
+        }
+
+        // ----- Expand each element of the list
+        if ($v_dirlist_nb != 0) {
+          // ----- Expand
+          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Concat the resulting list
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Merging result list (size '".sizeof($v_result_list)."') with dirlist (size '".sizeof($v_dirlist_descr)."')");
+          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "merged result list is size '".sizeof($v_result_list)."'");
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Nothing in this folder to expand.");
+        }
+
+        // ----- Free local array
+        unset($v_dirlist_descr);
+      }
+    }
+
+    // ----- Get the result list
+    $p_filedescr_list = $v_result_list;
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCreate()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCreate", "list");
+    $v_result=1;
+    $v_list_detail = array();
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the file in write mode
+    if (($v_result = $this->privOpenFd('wb')) != 1)
+    {
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Add the list of files
+    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAdd()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAdd", "list");
+    $v_result=1;
+    $v_list_detail = array();
+
+    // ----- Look if the archive exists or is empty
+    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Archive does not exist, or is empty, create it.");
+
+      // ----- Do a create
+      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
+    if (($v_result=$this->privOpenFd('rb')) != 1)
+    {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
+    @rewind($this->zip_fd);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position in file : ".ftell($this->zip_fd)."'");
+
+    // ----- Creates a temporay file
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+    // ----- Open the temporary file in write mode
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
+    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+    {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = $v_central_dir['offset'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
+      $v_buffer = fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Swap the file descriptor
+    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+    // the following methods on the temporary fil and not the real archive
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+    {
+      fclose($v_zip_temp_fd);
+      $this->privCloseFd();
+      @unlink($v_zip_temp_name);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "New offset of central dir : $v_offset");
+
+    // ----- Copy the block of file headers from the old archive
+    $v_size = $v_central_dir['size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Read $v_read_size bytes");
+      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Create the Central Dir files header
+    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          fclose($v_zip_temp_fd);
+          $this->privCloseFd();
+          @unlink($v_zip_temp_name);
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = $v_central_dir['comment'];
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd)-$v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    {
+      // ----- Reset the file list
+      unset($v_header_list);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Swap back the file descriptor
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Delete the zip file
+    // TBC : I should test the result ...
+    @unlink($this->zipname);
+
+    // ----- Rename the temporary file
+    // TBC : I should test the result ...
+    //@rename($v_zip_temp_name, $this->zipname);
+    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privOpenFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privOpenFd($p_mode)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privOpenFd", 'mode='.$p_mode);
+    $v_result=1;
+
+    // ----- Look if already open
+    if ($this->zip_fd != 0)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Open the zip file
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Open file in '.$p_mode.' mode');
+    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCloseFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privCloseFd()
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCloseFd", "");
+    $v_result=1;
+
+    if ($this->zip_fd != 0)
+      @fclose($this->zip_fd);
+    $this->zip_fd = 0;
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddList()
+  // Description :
+  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+  //   different from the real path of the file. This is usefull if you want to have PclTar
+  //   running in any directory, and memorize relative path from an other directory.
+  // Parameters :
+  //   $p_list : An array containing the file or directory names to add in the tar
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  //   $p_add_dir : Path to add in the filename path archived
+  //   $p_remove_dir : Path to remove in the filename path archived
+  // Return Values :
+  // --------------------------------------------------------------------------------
+//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddList", "list");
+    $v_result=1;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+    {
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+
+    // ----- Create the Central Dir files header
+    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = '';
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd)-$v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
+    {
+      // ----- Reset the file list
+      unset($v_header_list);
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFileList()
+  // Description :
+  // Parameters :
+  //   $p_filedescr_list : An array containing the file description
+  //                      or directory names to add in the zip
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFileList", "filedescr_list");
+    $v_result=1;
+    $v_header = array();
+
+    // ----- Recuperate the current number of elt in list
+    $v_nb = sizeof($p_result_list);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Before add, list have ".$v_nb." elements");
+
+    // ----- Loop on the files
+    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+      // ----- Format the filename
+      $p_filedescr_list[$j]['filename']
+      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for file '".$p_filedescr_list[$j]['filename']."'");
+
+      // ----- Skip empty file names
+      // TBC : Can this be possible ? not checked in DescrParseAtt ?
+      if ($p_filedescr_list[$j]['filename'] == "") {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Skip empty filename");
+        continue;
+      }
+
+      // ----- Check the filename
+      if (!file_exists($p_filedescr_list[$j]['filename'])) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$p_filedescr_list[$j]['filename']."' does not exists");
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exists");
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+
+      // ----- Look if it is a file or a dir with no all path remove option
+      if (   (is_file($p_filedescr_list[$j]['filename']))
+          || (   is_dir($p_filedescr_list[$j]['filename'])
+              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+        // ----- Add the file
+        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
+                                       $p_options);
+        if ($v_result != 1) {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+          return $v_result;
+        }
+
+        // ----- Store the file infos
+        $p_result_list[$v_nb++] = $v_header;
+      }
+    }
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "After add, list have ".$v_nb." elements");
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAddFile($p_filedescr, &$p_header, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFile", "filename='".$p_filedescr['filename']."'");
+    $v_result=1;
+
+    // ----- Working variable
+    $p_filename = $p_filedescr['filename'];
+
+    // TBC : Already done in the fileAtt check ... ?
+    if ($p_filename == "") {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Look for a stored different filename
+    if (isset($p_filedescr['stored_filename'])) {
+      $v_stored_filename = $p_filedescr['stored_filename'];
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'Stored filename is NOT the same "'.$v_stored_filename.'"');
+    }
+    else {
+      $v_stored_filename = $p_filedescr['stored_filename'];
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'Stored filename is the same');
+    }
+
+    // ----- Set the file properties
+    clearstatcache();
+    $p_header['version'] = 20;
+    $p_header['version_extracted'] = 10;
+    $p_header['flag'] = 0;
+    $p_header['compression'] = 0;
+    $p_header['mtime'] = filemtime($p_filename);
+    $p_header['crc'] = 0;
+    $p_header['compressed_size'] = 0;
+    $p_header['size'] = filesize($p_filename);
+    $p_header['filename_len'] = strlen($p_filename);
+    $p_header['extra_len'] = 0;
+    $p_header['comment_len'] = 0;
+    $p_header['disk'] = 0;
+    $p_header['internal'] = 0;
+//    $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
+    $p_header['external'] = (is_file($p_filename)?0x00000000:0x00000010);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header external extension '".sprintf("0x%X",$p_header['external'])."'");
+    $p_header['offset'] = 0;
+    $p_header['filename'] = $p_filename;
+    $p_header['stored_filename'] = $v_stored_filename;
+    $p_header['extra'] = '';
+    $p_header['comment'] = '';
+    $p_header['status'] = 'ok';
+    $p_header['index'] = -1;
+
+    // ----- Look for pre-add callback
+    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_ADD]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_header['status'] = "skipped";
+        $v_result = 1;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New stored filename is '".$p_header['stored_filename']."'");
+      }
+    }
+
+    // ----- Look for empty stored filename
+    if ($p_header['stored_filename'] == "") {
+      $p_header['status'] = "filtered";
+    }
+
+    // ----- Check the path length
+    if (strlen($p_header['stored_filename']) > 0xFF) {
+      $p_header['status'] = 'filename_too_long';
+    }
+
+    // ----- Look if no error, or file not skipped
+    if ($p_header['status'] == 'ok') {
+
+      // ----- Look for a file
+      if (is_file($p_filename))
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a file");
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return PclZip::errorCode();
+        }
+
+        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be compressed");
+          // ----- Read the file content
+          $v_content_compressed = @fread($v_file, $p_header['size']);
+
+          // ----- Calculate the CRC
+          $p_header['crc'] = @crc32($v_content_compressed);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = $p_header['size'];
+          $p_header['compression'] = 0;
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will be compressed");
+          // ----- Read the file content
+          $v_content = @fread($v_file, $p_header['size']);
+
+          // ----- Calculate the CRC
+          $p_header['crc'] = @crc32($v_content);
+
+          // ----- Compress the file
+          $v_content_compressed = @gzdeflate($v_content);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = strlen($v_content_compressed);
+          $p_header['compression'] = 8;
+        }
+
+        // ----- Look for encryption
+        /*
+        if ((isset($p_options[PCLZIP_OPT_CRYPT]))
+		    && ($p_options[PCLZIP_OPT_CRYPT] != "")) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File need to be crypted ....");
+
+          // Should be a random header
+          $v_header = 'xxxxxxxxxxxx';
+	      $v_content_compressed = PclZipUtilZipEncrypt($v_content_compressed,
+		                                           $p_header['compressed_size'],
+	                                               $v_header,
+												   $p_header['crc'],
+												   "test");
+
+          $p_header['compressed_size'] += 12;
+          $p_header['flag'] = 1;
+
+          // ----- Add the header to the data
+          $v_content_compressed = $v_header.$v_content_compressed;
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size after header : ".strlen($v_content_compressed)."");
+        }
+        */
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          @fclose($v_file);
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+          return $v_result;
+        }
+
+        // ----- Write the compressed (or not) content
+        @fwrite($this->zip_fd,
+		            $v_content_compressed, $p_header['compressed_size']);
+
+        // ----- Close the file
+        @fclose($v_file);
+      }
+
+      // ----- Look for a directory
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a folder");
+        // ----- Look for directory last '/'
+        if (@substr($p_header['stored_filename'], -1) != '/') {
+          $p_header['stored_filename'] .= '/';
+        }
+
+        // ----- Set the file properties
+        $p_header['size'] = 0;
+        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
+        {
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+          return $v_result;
+        }
+      }
+    }
+
+    // ----- Look for post-add callback
+    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_ADD]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+      if ($v_result == 0) {
+        // ----- Ignored
+        $v_result = 1;
+      }
+
+      // ----- Update the informations
+      // Nothing can be modified
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCalculateStoredFilename()
+  // Description :
+  //   Based on file descriptor properties and global options, this method
+  //   calculate the filename that will be stored in the archive.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCalculateStoredFilename", "filename='".$p_filedescr['filename']."'");
+    $v_result=1;
+
+    // ----- Working variables
+    $p_filename = $p_filedescr['filename'];
+    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+    }
+    else {
+      $p_add_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+    }
+    else {
+      $p_remove_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+    }
+    else {
+      $p_remove_all_dir = 0;
+    }
+
+    // ----- Look for full name change
+    if (isset($p_filedescr['new_full_name'])) {
+      $v_stored_filename = $p_filedescr['new_full_name'];
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing full name of '".$p_filename."' for '".$v_stored_filename."'");
+    }
+
+    // ----- Look for path and/or short name change
+    else {
+
+      // ----- Look for short name change
+      if (isset($p_filedescr['new_short_name'])) {
+        $v_path_info = pathinfo($p_filename);
+        $v_dir = '';
+        if ($v_path_info['dirname'] != '') {
+          $v_dir = $v_path_info['dirname'].'/';
+        }
+        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing short name of '".$p_filename."' for '".$v_stored_filename."'");
+      }
+      else {
+        // ----- Calculate the stored filename
+        $v_stored_filename = $p_filename;
+      }
+
+      // ----- Look for all path to remove
+      if ($p_remove_all_dir) {
+        $v_stored_filename = basename($p_filename);
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Remove all path selected change '".$p_filename."' for '".$v_stored_filename."'");
+      }
+      // ----- Look for partial path remove
+      else if ($p_remove_dir != "") {
+        if (substr($p_remove_dir, -1) != '/')
+          $p_remove_dir .= "/";
+
+        if (   (substr($p_filename, 0, 2) == "./")
+            || (substr($p_remove_dir, 0, 2) == "./")) {
+
+          if (   (substr($p_filename, 0, 2) == "./")
+              && (substr($p_remove_dir, 0, 2) != "./")) {
+            $p_remove_dir = "./".$p_remove_dir;
+          }
+          if (   (substr($p_filename, 0, 2) != "./")
+              && (substr($p_remove_dir, 0, 2) == "./")) {
+            $p_remove_dir = substr($p_remove_dir, 2);
+          }
+        }
+
+        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
+                                             $v_stored_filename);
+        if ($v_compare > 0) {
+          if ($v_compare == 2) {
+            $v_stored_filename = "";
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Path to remove is the current folder");
+          }
+          else {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Remove path '$p_remove_dir' in file '$v_stored_filename'");
+            $v_stored_filename = substr($v_stored_filename,
+                                        strlen($p_remove_dir));
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Result is '$v_stored_filename'");
+          }
+        }
+      }
+      // ----- Look for path to add
+      if ($p_add_dir != "") {
+        if (substr($p_add_dir, -1) == "/")
+          $v_stored_filename = $p_add_dir.$v_stored_filename;
+        else
+          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'");
+      }
+    }
+
+    // ----- Filename (reduce the path of stored name)
+    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+    $p_filedescr['stored_filename'] = $v_stored_filename;
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Stored filename will be '".$p_filedescr['stored_filename']."', strlen ".strlen($p_filedescr['stored_filename']));
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteFileHeader(&$p_header)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"');
+    $v_result=1;
+
+    // ----- Store the offset position of the file
+    $p_header['offset'] = ftell($this->zip_fd);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, 'File offset of the header :'.$p_header['offset']);
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    $v_date = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
+	                      $p_header['version_extracted'], $p_header['flag'],
+                          $p_header['compression'], $v_mtime, $v_mdate,
+                          $p_header['crc'], $p_header['compressed_size'],
+						  $p_header['size'],
+                          strlen($p_header['stored_filename']),
+						  $p_header['extra_len']);
+
+    // ----- Write the first 148 bytes of the header in the archive
+    fputs($this->zip_fd, $v_binary_data, 30);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0)
+    {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteCentralFileHeader(&$p_header)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralFileHeader", 'file="'.$p_header['filename'].'", stored as "'.$p_header['stored_filename'].'"');
+    $v_result=1;
+
+    // TBC
+    //for(reset($p_header); $key = key($p_header); next($p_header)) {
+    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "header[$key] = ".$p_header[$key]);
+    //}
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    $v_date = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
+	                      $p_header['version'], $p_header['version_extracted'],
+                          $p_header['flag'], $p_header['compression'],
+						  $v_mtime, $v_mdate, $p_header['crc'],
+                          $p_header['compressed_size'], $p_header['size'],
+                          strlen($p_header['stored_filename']),
+						  $p_header['extra_len'], $p_header['comment_len'],
+                          $p_header['disk'], $p_header['internal'],
+						  $p_header['external'], $p_header['offset']);
+
+    // ----- Write the 42 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 46);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0)
+    {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+    if ($p_header['comment_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privWriteCentralHeader", 'nb_entries='.$p_nb_entries.', size='.$p_size.', offset='.$p_offset.', comment="'.$p_comment.'"');
+    $v_result=1;
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
+	                      $p_nb_entries, $p_size,
+						  $p_offset, strlen($p_comment));
+
+    // ----- Write the 22 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 22);
+
+    // ----- Write the variable fields
+    if (strlen($p_comment) != 0)
+    {
+      fputs($this->zip_fd, $p_comment, strlen($p_comment));
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privList()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privList(&$p_list)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privList", "list");
+    $v_result=1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
+    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+    {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privSwapBackMagicQuotes();
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Go to beginning of Central Dir
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Offset : ".$v_central_dir['offset']."'");
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
+    @rewind($this->zip_fd);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
+    if (@fseek($this->zip_fd, $v_central_dir['offset']))
+    {
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position in file : ".ftell($this->zip_fd)."'");
+
+    // ----- Read each entry
+    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    {
+      // ----- Read the file header
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+      {
+        $this->privSwapBackMagicQuotes();
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+        return $v_result;
+      }
+      $v_header['index'] = $i;
+
+      // ----- Get the only interesting attributes
+      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+      unset($v_header);
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privConvertHeader2FileInfo()
+  // Description :
+  //   This function takes the file informations from the central directory
+  //   entries and extract the interesting parameters that will be given back.
+  //   The resulting file infos are set in the array $p_info
+  //     $p_info['filename'] : Filename with full path. Given by user (add),
+  //                           extracted in the filesystem (extract).
+  //     $p_info['stored_filename'] : Stored filename in the archive.
+  //     $p_info['size'] = Size of the file.
+  //     $p_info['compressed_size'] = Compressed size of the file.
+  //     $p_info['mtime'] = Last modification date of the file.
+  //     $p_info['comment'] = Comment associated with the file.
+  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+  //     $p_info['status'] = status of the action on the file.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privConvertHeader2FileInfo($p_header, &$p_info)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privConvertHeader2FileInfo", "Filename='".$p_header['filename']."'");
+    $v_result=1;
+
+    // ----- Get the interesting attributes
+    $p_info['filename'] = $p_header['filename'];
+    $p_info['stored_filename'] = $p_header['stored_filename'];
+    $p_info['size'] = $p_header['size'];
+    $p_info['compressed_size'] = $p_header['compressed_size'];
+    $p_info['mtime'] = $p_header['mtime'];
+    $p_info['comment'] = $p_header['comment'];
+    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['index'] = $p_header['index'];
+    $p_info['status'] = $p_header['status'];
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractByRule()
+  // Description :
+  //   Extract a file or directory depending of rules (by index, by name, ...)
+  // Parameters :
+  //   $p_file_list : An array where will be placed the properties of each
+  //                  extracted file
+  //   $p_path : Path to add while writing the extracted files
+  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+  //                    extracted files. If the path does not match the file path,
+  //                    the file is extracted with its memorized path.
+  //                    $p_remove_path does not apply to 'list' mode.
+  //                    $p_path and $p_remove_path are commulative.
+  // Return Values :
+  //   1 on success,0 or less on error (see error code list)
+  // --------------------------------------------------------------------------------
+  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privExtractByRule", "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'");
+    $v_result=1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check the path
+    if (   ($p_path == "")
+	    || (   (substr($p_path, 0, 1) != "/")
+		    && (substr($p_path, 0, 3) != "../")
+			&& (substr($p_path,1,2)!=":/")))
+      $p_path = "./".$p_path;
+
+    // ----- Reduce the path last (and duplicated) '/'
+    if (($p_path != "./") && ($p_path != "/"))
+    {
+      // ----- Look for the path end '/'
+      while (substr($p_path, -1) == "/")
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Destination path [$p_path] ends by '/'");
+        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Modified to [$p_path]");
+      }
+    }
+
+    // ----- Look for path to remove format (should end by /)
+    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
+    {
+      $p_remove_path .= '/';
+    }
+    $p_remove_path_size = strlen($p_remove_path);
+
+    // ----- Open the zip file
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Open file in binary read mode");
+    if (($v_result = $this->privOpenFd('rb')) != 1)
+    {
+      $this->privSwapBackMagicQuotes();
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      // ----- Close the zip file
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    // ----- Start at beginning of Central Dir
+    $v_pos_entry = $v_central_dir['offset'];
+
+    // ----- Read each entry
+    $j_start = 0;
+    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Read next file header entry : '$i'");
+
+      // ----- Read next Central dir entry
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position before rewind : ".ftell($this->zip_fd)."'");
+      @rewind($this->zip_fd);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Position after rewind : ".ftell($this->zip_fd)."'");
+      if (@fseek($this->zip_fd, $v_pos_entry))
+      {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Position after fseek : ".ftell($this->zip_fd)."'");
+
+      // ----- Read the file header
+      $v_header = array();
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+      {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+        return $v_result;
+      }
+
+      // ----- Store the index
+      $v_header['index'] = $i;
+
+      // ----- Store the file position
+      $v_pos_entry = ftell($this->zip_fd);
+
+      // ----- Look for the specific extract rules
+      $v_extract = false;
+
+      // ----- Look for extract by name rule
+      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByName'");
+
+          // ----- Look if the filename is in the list
+          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Compare with file '".$p_options[PCLZIP_OPT_BY_NAME][$j]."'");
+
+              // ----- Look for a directory
+              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The searched item is a directory");
+
+                  // ----- Look if the directory is in the filename path
+                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The directory is in the file path");
+                      $v_extract = true;
+                  }
+              }
+              // ----- Look for a filename
+              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "The file is the right one.");
+                  $v_extract = true;
+              }
+          }
+      }
+
+      // ----- Look for extract by ereg rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'");
+
+          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
+              $v_extract = true;
+          }
+      }
+
+      // ----- Look for extract by preg rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByEreg'");
+
+          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression");
+              $v_extract = true;
+          }
+      }
+
+      // ----- Look for extract by index rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'");
+
+          // ----- Look if the index is in the list
+          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look if index '$i' is in [".$p_options[PCLZIP_OPT_BY_INDEX][$j]['start'].",".$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']."]");
+
+              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found as part of an index range");
+                  $v_extract = true;
+              }
+              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Do not look this index range for next loop");
+                  $j_start = $j+1;
+              }
+
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Index range is greater than index, stop loop");
+                  break;
+              }
+          }
+      }
+
+      // ----- Look for no rule, which means extract all the archive
+      else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with no rule (extract all)");
+          $v_extract = true;
+      }
+
+	  // ----- Check compression method
+	  if (   ($v_extract)
+	      && (   ($v_header['compression'] != 8)
+		      && ($v_header['compression'] != 0))) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unsupported compression method (".$v_header['compression'].")");
+          $v_header['status'] = 'unsupported_compression';
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
+
+              $this->privSwapBackMagicQuotes();
+
+              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+			                       "Filename '".$v_header['stored_filename']."' is "
+				  	    	  	   ."compressed by an unsupported compression "
+				  	    	  	   ."method (".$v_header['compression'].") ");
+
+              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+              return PclZip::errorCode();
+		  }
+	  }
+
+	  // ----- Check encrypted files
+	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unsupported file encryption");
+          $v_header['status'] = 'unsupported_encryption';
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
+
+              $this->privSwapBackMagicQuotes();
+
+              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
+			                       "Unsupported encryption for "
+				  	    	  	   ." filename '".$v_header['stored_filename']
+								   ."'");
+
+              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+              return PclZip::errorCode();
+		  }
+    }
+
+      // ----- Look for real extraction
+      if (($v_extract) && ($v_header['status'] != 'ok')) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "No need for extract");
+          $v_result = $this->privConvertHeader2FileInfo($v_header,
+		                                        $p_file_list[$v_nb_extracted++]);
+          if ($v_result != 1) {
+              $this->privCloseFd();
+              $this->privSwapBackMagicQuotes();
+              //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+              return $v_result;
+          }
+
+          $v_extract = false;
+      }
+
+      // ----- Look for real extraction
+      if ($v_extract)
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file '".$v_header['filename']."', index '$i'");
+
+        // ----- Go to the file position
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position before rewind : ".ftell($this->zip_fd)."'");
+        @rewind($this->zip_fd);
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after rewind : ".ftell($this->zip_fd)."'");
+        if (@fseek($this->zip_fd, $v_header['offset']))
+        {
+          // ----- Close the zip file
+          $this->privCloseFd();
+
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+          // ----- Return
+          //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+          return PclZip::errorCode();
+        }
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Position after fseek : ".ftell($this->zip_fd)."'");
+
+        // ----- Look for extraction as string
+        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFileAsString($v_header, $v_string);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
+          {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Set the file content
+          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+          // ----- Next extracted file
+          $v_nb_extracted++;
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+        // ----- Look for extraction in standard output
+        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+          // ----- Extracting the file in standard output
+          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+        // ----- Look for normal extraction
+        else {
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFile($v_header,
+		                                      $p_path, $p_remove_path,
+											  $p_remove_all_path,
+											  $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result1);
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
+          {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+      }
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //
+  // 1 : ... ?
+  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+  // --------------------------------------------------------------------------------
+  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFile', "path='$p_path', remove_path='$p_remove_path', remove_all_path='".($p_remove_all_path?'true':'false')."'");
+    $v_result=1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    {
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    // ----- Look for all path to remove
+    if ($p_remove_all_path == true) {
+        // ----- Look for folder entry that not need to be extracted
+        if (($p_entry['external']&0x00000010)==0x00000010) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The entry is a folder : need to be filtered");
+
+            $p_entry['status'] = "filtered";
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+        }
+
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "All path is removed");
+        // ----- Get the basename of the path
+        $p_entry['filename'] = basename($p_entry['filename']);
+    }
+
+    // ----- Look for path to remove
+    else if ($p_remove_path != "")
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Look for some path to remove");
+      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The folder is the same as the removed path '".$p_entry['filename']."'");
+
+        // ----- Change the file status
+        $p_entry['status'] = "filtered";
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+        return $v_result;
+      }
+
+      $p_remove_path_size = strlen($p_remove_path);
+      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file '".$p_entry['filename']."'");
+
+        // ----- Remove the path
+        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Resulting file is '".$p_entry['filename']."'");
+      }
+    }
+
+    // ----- Add the path
+    if ($p_path != '') {
+      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+    }
+
+    // ----- Check a base_dir_restriction
+    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Check the extract directory restriction");
+      $v_inclusion
+      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
+                                $p_entry['filename']);
+      if ($v_inclusion == 0) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_EXTRACT_DIR_RESTRICTION is selected, file is outside restriction");
+
+        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
+			                     "Filename '".$p_entry['filename']."' is "
+								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'");
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'");
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+    // ----- Look for specific actions while the file exist
+    if (file_exists($p_entry['filename']))
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File '".$p_entry['filename']."' already exists");
+
+      // ----- Look if file is a directory
+      if (is_dir($p_entry['filename']))
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is a directory");
+
+        // ----- Change the file status
+        $p_entry['status'] = "already_a_directory";
+
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        // For historical reason first PclZip implementation does not stop
+        // when this kind of error occurs.
+        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
+
+            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
+			                     "Filename '".$p_entry['filename']."' is "
+								 ."already used by an existing directory");
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+		}
+      }
+      // ----- Look if file is write protected
+      else if (!is_writeable($p_entry['filename']))
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is write protected");
+
+        // ----- Change the file status
+        $p_entry['status'] = "write_protected";
+
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        // For historical reason first PclZip implementation does not stop
+        // when this kind of error occurs.
+        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
+
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+			                     "Filename '".$p_entry['filename']."' exists "
+								 ."and is write protected");
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+            return PclZip::errorCode();
+		}
+      }
+
+      // ----- Look if the extracted file is older
+      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is newer (".date("l dS of F Y h:i:s A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F Y h:i:s A", $p_entry['mtime']).")");
+        // ----- Change the file status
+        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_REPLACE_NEWER is selected, file will be replaced");
+		}
+		else {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File will not be replaced");
+            $p_entry['status'] = "newer_exist";
+
+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+            // For historical reason first PclZip implementation does not stop
+            // when this kind of error occurs.
+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+                //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_STOP_ON_ERROR is selected, extraction will be stopped");
+
+                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+			             "Newer version of '".$p_entry['filename']."' exists "
+					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+                return PclZip::errorCode();
+		    }
+		}
+      }
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Existing file '".$p_entry['filename']."' is older than the extrated one - will be replaced by the extracted one (".date("l dS of F Y h:i:s A", filemtime($p_entry['filename'])).") than the extracted file (".date("l dS of F Y h:i:s A", $p_entry['mtime']).")");
+      }
+    }
+
+    // ----- Check the directory availability and create it if necessary
+    else {
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+        $v_dir_to_check = $p_entry['filename'];
+      else if (!strstr($p_entry['filename'], "/"))
+        $v_dir_to_check = "";
+      else
+        $v_dir_to_check = dirname($p_entry['filename']);
+
+      if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to create path for '".$p_entry['filename']."'");
+
+        // ----- Change the file status
+        $p_entry['status'] = "path_creation_fail";
+
+        // ----- Return
+        ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+        //return $v_result;
+        $v_result = 1;
+      }
+    }
+    }
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      {
+        // ----- Look for not compressed file
+        if ($p_entry['compression'] == 0) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
+
+		  // ----- Opening destination file
+          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+          {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
+
+            // ----- Change the file status
+            $p_entry['status'] = "write_error";
+
+            // ----- Return
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Read '".$p_entry['size']."' bytes");
+
+          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+          $v_size = $p_entry['compressed_size'];
+          while ($v_size != 0)
+          {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Read $v_read_size bytes");
+            $v_buffer = @fread($this->zip_fd, $v_read_size);
+            /* Try to speed up the code
+            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+            */
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+          }
+
+          // ----- Closing the destination file
+          fclose($v_dest_file);
+
+          // ----- Change the file mtime
+          touch($p_entry['filename'], $p_entry['mtime']);
+
+
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file (Compression method ".$p_entry['compression'].")");
+          // ----- TBC
+          // Need to be finished
+          if (($p_entry['flag'] & 1) == 1) {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "File is encrypted");
+            /*
+              // ----- Read the encryption header
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read 12 encryption header bytes");
+              $v_encryption_header = @fread($this->zip_fd, 12);
+
+              // ----- Read the encrypted & compressed file in a buffer
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".($p_entry['compressed_size']-12)."' compressed & encrypted bytes");
+              $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']-12);
+
+              // ----- Decrypt the buffer
+              $this->privDecrypt($v_encryption_header, $v_buffer,
+			                     $p_entry['compressed_size']-12, $p_entry['crc']);
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Buffer is '".$v_buffer."'");
+              */
+          }
+          else {
+              //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".$p_entry['compressed_size']."' compressed bytes");
+              // ----- Read the compressed file in a buffer (one shot)
+              $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+          }
+
+          // ----- Decompress the file
+          $v_file_content = @gzinflate($v_buffer);
+          unset($v_buffer);
+          if ($v_file_content === FALSE) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to inflate compressed file");
+
+            // ----- Change the file status
+            // TBC
+            $p_entry['status'] = "error";
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Opening destination file
+          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
+
+            // ----- Change the file status
+            $p_entry['status'] = "write_error";
+
+            //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+            return $v_result;
+          }
+
+          // ----- Write the uncompressed data
+          @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+          unset($v_file_content);
+
+          // ----- Closing the destination file
+          @fclose($v_dest_file);
+
+          // ----- Change the file mtime
+          @touch($p_entry['filename'], $p_entry['mtime']);
+        }
+
+        // ----- Look for chmod option
+        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "chmod option activated '".$p_options[PCLZIP_OPT_SET_CHMOD]."'");
+
+          // ----- Change the mode of the file
+          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+        }
+
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
+      }
+    }
+
+	// ----- Change abort status
+	if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+	}
+
+    // ----- Look for post-extract callback
+    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileInOutput()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privExtractFileInOutput(&$p_entry, &$p_options)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileInOutput', "");
+    $v_result=1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A pre-callback '".$p_options[PCLZIP_CB_PRE_EXTRACT]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "New filename is '".$p_entry['filename']."'");
+    }
+
+    // ----- Trace
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file (with path) '".$p_entry['filename']."', size '$v_header[size]'");
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+        // ----- Look for not compressed file
+        if ($p_entry['compressed_size'] == $p_entry['size']) {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes");
+
+          // ----- Read the file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Send the file to the output
+          echo $v_buffer;
+          unset($v_buffer);
+        }
+        else {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file");
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Reading '".$p_entry['size']."' bytes");
+
+          // ----- Read the compressed file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Decompress the file
+          $v_file_content = gzinflate($v_buffer);
+          unset($v_buffer);
+
+          // ----- Send the file to the output
+          echo $v_file_content;
+          unset($v_file_content);
+        }
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
+      }
+    }
+
+	// ----- Change abort status
+	if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+	}
+
+    // ----- Look for post-extract callback
+    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "A post-callback '".$p_options[PCLZIP_CB_POST_EXTRACT]."()') is defined for the extraction");
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "User callback abort the extraction");
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileAsString()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privExtractFileAsString(&$p_entry, &$p_string)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileAsString', "p_entry['filename']='".$p_entry['filename']."'");
+    $v_result=1;
+
+    // ----- Read the file header
+    $v_header = array();
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    {
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+      return $v_result;
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting file in string (with path) '".$p_entry['filename']."', size '$v_header[size]'");
+
+    // ----- Do the extraction (if not a folder)
+    if (!(($p_entry['external']&0x00000010)==0x00000010))
+    {
+      // ----- Look for not compressed file
+//      if ($p_entry['compressed_size'] == $p_entry['size'])
+      if ($p_entry['compression'] == 0) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting an un-compressed file");
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Reading '".$p_entry['size']."' bytes");
+
+        // ----- Reading the file
+        $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+      }
+      else {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extracting a compressed file (compression method '".$p_entry['compression']."')");
+
+        // ----- Reading the file
+        $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+        // ----- Decompress the file
+        if (($p_string = @gzinflate($v_data)) === FALSE) {
+            // TBC
+        }
+      }
+
+      // ----- Trace
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Extraction done");
+    }
+    else {
+        // TBC : error : can not extract a folder in a string
+    }
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadFileHeader(&$p_header)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadFileHeader", "");
+    $v_result=1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
+    $v_data = unpack('Vid', $v_binary_data);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x04034b50)
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid File header");
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 26);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 26)
+    {
+      $p_header['filename'] = "";
+      $p_header['status'] = "invalid_header";
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header : '".$v_binary_data."'");
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Header (Hex) : '".bin2hex($v_binary_data)."'");
+    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+    // ----- Get filename
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "File name length : ".$v_data['filename_len']);
+    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Filename : \''.$p_header['filename'].'\'');
+
+    // ----- Get extra_fields
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extra field length : ".$v_data['extra_len']);
+    if ($v_data['extra_len'] != 0) {
+      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+    }
+    else {
+      $p_header['extra'] = '';
+    }
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Extra field : \''.bin2hex($p_header['extra']).'\'');
+
+    // ----- Extract properties
+    $p_header['version_extracted'] = $v_data['version'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version need to extract : ('.$p_header['version_extracted'].') \''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
+    $p_header['compression'] = $v_data['compression'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compression method : \''.$p_header['compression'].'\'');
+    $p_header['size'] = $v_data['size'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : \''.$p_header['size'].'\'');
+    $p_header['compressed_size'] = $v_data['compressed_size'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compressed Size : \''.$p_header['compressed_size'].'\'');
+    $p_header['crc'] = $v_data['crc'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : \''.sprintf("0x%X", $p_header['crc']).'\'');
+    $p_header['flag'] = $v_data['flag'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Flag : \''.$p_header['flag'].'\'');
+    $p_header['filename_len'] = $v_data['filename_len'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Filename_len : \''.$p_header['filename_len'].'\'');
+
+    // ----- Recuperate date in UNIX format
+    $p_header['mdate'] = $v_data['mdate'];
+    $p_header['mtime'] = $v_data['mtime'];
+    if ($p_header['mdate'] && $p_header['mtime'])
+    {
+      // ----- Extract time
+      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+      // ----- Extract date
+      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    }
+    else
+    {
+      $p_header['mtime'] = time();
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    }
+
+    // TBC
+    //for(reset($v_data); $key = key($v_data); next($v_data)) {
+    //  //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Attribut[$key] = ".$v_data[$key]);
+    //}
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set the status field
+    $p_header['status'] = "ok";
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadCentralFileHeader(&$p_header)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadCentralFileHeader", "");
+    $v_result=1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
+    $v_data = unpack('Vid', $v_binary_data);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x02014b50)
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Invalid Central Dir File signature");
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 42);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 42)
+    {
+      $p_header['filename'] = "";
+      $p_header['status'] = "invalid_header";
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header : '".$v_binary_data."'");
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header (Hex) : '".bin2hex($v_binary_data)."'");
+    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+    // ----- Get filename
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "File name length : ".$p_header['filename_len']);
+    if ($p_header['filename_len'] != 0)
+      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    else
+      $p_header['filename'] = '';
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Filename : \''.$p_header['filename'].'\'');
+
+    // ----- Get extra
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Extra length : ".$p_header['extra_len']);
+    if ($p_header['extra_len'] != 0)
+      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    else
+      $p_header['extra'] = '';
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Extra : \''.$p_header['extra'].'\'');
+
+    // ----- Get comment
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Comment length : ".$p_header['comment_len']);
+    if ($p_header['comment_len'] != 0)
+      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    else
+      $p_header['comment'] = '';
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Comment : \''.$p_header['comment'].'\'');
+
+    // ----- Extract properties
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version : \''.($p_header['version']/10).'.'.($p_header['version']%10).'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Version need to extract : \''.($p_header['version_extracted']/10).'.'.($p_header['version_extracted']%10).'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Size : \''.$p_header['size'].'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Compressed Size : \''.$p_header['compressed_size'].'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'CRC : \''.sprintf("0x%X", $p_header['crc']).'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Flag : \''.$p_header['flag'].'\'');
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Offset : \''.$p_header['offset'].'\'');
+
+    // ----- Recuperate date in UNIX format
+    if ($p_header['mdate'] && $p_header['mtime'])
+    {
+      // ----- Extract time
+      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+      // ----- Extract date
+      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    }
+    else
+    {
+      $p_header['mtime'] = time();
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Date is actual : \''.date("d/m/y H:i:s", $p_header['mtime']).'\'');
+    }
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set default status to ok
+    $p_header['status'] = 'ok';
+
+    // ----- Look if it is a directory
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Internal (Hex) : '".sprintf("Ox%04X", $p_header['internal'])."'");
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "External (Hex) : '".sprintf("Ox%04X", $p_header['external'])."' (".(($p_header['external']&0x00000010)==0x00000010?'is a folder':'is a file').')');
+    if (substr($p_header['filename'], -1) == '/') {
+      //$p_header['external'] = 0x41FF0010;
+      $p_header['external'] = 0x00000010;
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Force folder external : \''.sprintf("Ox%04X", $p_header['external']).'\'');
+    }
+
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Header of filename : \''.$p_header['filename'].'\'');
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFileHeaders()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success,
+  //   0 on error;
+  // --------------------------------------------------------------------------------
+  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCheckFileHeaders", "");
+    $v_result=1;
+
+	// ----- Check the static values
+	// TBC
+	if ($p_local_header['filename'] != $p_central_header['filename']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename" : TBC To Be Completed');
+	}
+	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "version_extracted" : TBC To Be Completed');
+	}
+	if ($p_local_header['flag'] != $p_central_header['flag']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "flag" : TBC To Be Completed');
+	}
+	if ($p_local_header['compression'] != $p_central_header['compression']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "compression" : TBC To Be Completed');
+	}
+	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "mtime" : TBC To Be Completed');
+	}
+	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename_len" : TBC To Be Completed');
+	}
+
+	// ----- Look for flag bit 3
+	if (($p_local_header['flag'] & 8) == 8) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Purpose bit flag bit 3 set !');
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'File size, compression size and crc found in central header');
+        $p_local_header['size'] = $p_central_header['size'];
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Size : \''.$p_local_header['size'].'\'');
+        $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Compressed Size : \''.$p_local_header['compressed_size'].'\'');
+        $p_local_header['crc'] = $p_central_header['crc'];
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'CRC : \''.sprintf("0x%X", $p_local_header['crc']).'\'');
+	}
+
+    // ----- Return
+    //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadEndCentralDir()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadEndCentralDir(&$p_central_dir)
+  {
+    //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privReadEndCentralDir", "");
+    $v_result=1;
+
+    // ----- Go to the end of the zip file
+    $v_size = filesize($this->zipname);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Size of the file :$v_size");
+    @fseek($this->zip_fd, $v_size);
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position at end of zip file : \''.ftell($this->zip_fd).'\'');
+    if (@ftell($this->zip_fd) != $v_size)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- First try : look if this is an archive with no commentaries (most of the time)
+    // in this case the end of central dir is at 22 bytes of the file end
+    $v_found = 0;
+    if ($v_size > 26) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Look for central dir with no comment');
+      @fseek($this->zip_fd, $v_size-22);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after min central position : \''.ftell($this->zip_fd).'\'');
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+
+      // ----- Read for bytes
+      $v_binary_data = @fread($this->zip_fd, 4);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Binary data is : '".sprintf("%08x", $v_binary_data)."'");
+      $v_data = @unpack('Vid', $v_binary_data);
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Binary signature is : '".sprintf("0x%08x", $v_data['id'])."'");
+
+      // ----- Check signature
+      if ($v_data['id'] == 0x06054b50) {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Found central dir at the default position.");
+        $v_found = 1;
+      }
+
+      $v_pos = ftell($this->zip_fd);
+    }
+
+    // ----- Go back to the maximum possible size of the Central Dir End Record
+    if (!$v_found) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Start extended search of end central dir');
+      $v_maximum_size = 65557; // 0xFFFF + 22;
+      if ($v_maximum_size > $v_size)
+        $v_maximum_size = $v_size;
+      @fseek($this->zip_fd, $v_size-$v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+      {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Position after max central position : \''.ftell($this->zip_fd).'\'');
+
+      // ----- Read byte per byte in order to find the signature
+      $v_pos = ftell($this->zip_fd);
+      $v_bytes = 0x00000000;
+      while ($v_pos < $v_size)
+      {
+        // ----- Read a byte
+        $v_byte = @fread($this->zip_fd, 1);
+
+        // -----  Add the byte
+        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+        // ----- Compare the bytes
+        if ($v_bytes == 0x504b0506)
+        {
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, 'Found End Central Dir signature at position : \''.ftell($this->zip_fd).'\'');
+          $v_pos++;
+          break;
+        }
+
+        $v_pos++;
+      }
+
+      // ----- Look if not found end of central dir
+      if ($v_pos == $v_size)
+      {
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to find End of Central Dir Record signature");
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+        // ----- Return
+        //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Read the first 18 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 18);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 18)
+    {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record : '".$v_binary_data."'");
+    ////--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Central Dir Record (Hex) : '".bin2hex($v_binary_data)."'");
+    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+    // ----- Check the global size
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Comment length : ".$v_data['comment_size']);
+    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+      //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "The central dir is not at the end of the archive. Some trailing bytes exists after the archive.");
+
+	  // ----- Removed in release 2.2 see readme file
+	  // The check of the file size is a little too strict.
+	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+	  // While decrypted, zip has training 0 bytes
+	  if (0) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
+	                       'The central dir is not at the end of the archive.'
+						   .' Some trailing bytes exists after the archive.');
+
+      // ----- Return
+      //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, PclZip::errorCode(), PclZip::errorInfo());
+      return PclZip::errorCode();
+	  }
+    }
+
+    // ----- Get comment
+    if ($v_data['comment_size'] != 0)
+      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    else
+      $p_central_dir['comment'] = '';
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Comment : \''.$p_central_dir['comment'].'\'');
+
+    $p_central_dir['entries'] = $v_data['entries'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries : \''.$p_central_dir['entries'].'\'');
+    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Nb of entries for this disk : \''.$p_central_dir['disk_entries'].'\'');
+    $p_central_dir['offset'] = $v_data['offset'];
+    //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Offset of Central Dir : \''.$p_central_dir['o