Index: wp-admin/includes/press-this.php
===================================================================
--- wp-admin/includes/press-this.php	(revision 0)
+++ wp-admin/includes/press-this.php	(revision 0)
@@ -0,0 +1,313 @@
+<?php
+/**
+ * Press This Functions
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ */
+
+/**
+ * Press It form handler.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since 2.6.0
+ *
+ * @return int Post ID
+ */
+function press_it( $post_type ) {
+
+	$post = get_default_post_to_edit( $post_type );
+	$post = get_object_vars( $post );
+	$post_ID = $post['ID'] = (int) $_POST['post_id'];
+
+	if ( ! current_user_can( 'edit_post', $post_ID ) )
+		wp_die( __('You are not allowed to edit this post.' ) );
+
+	$post['post_category'] = isset( $_POST['post_category'] ) ? $_POST['post_category'] : '';
+	$post['tax_input'] = isset( $_POST['tax_input'] ) ? $_POST['tax_input'] : '';
+	$post['post_title'] = isset( $_POST['title'] ) ? $_POST['title'] : '';
+	$content = isset( $_POST['content'] ) ? $_POST['content'] : '';
+
+	$upload = false;
+	if ( !empty( $_POST['photo_src'] ) && current_user_can( 'upload_files' ) ) {
+		foreach( (array) $_POST['photo_src'] as $key => $image) {
+			// see if files exist in content - we don't want to upload non-used selected files.
+			if ( strpos( $_POST['content'], htmlspecialchars( $image ) ) !== false ) {
+				$desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
+				$upload = media_sideload_image( $image, $post_ID, $desc );
+
+				// Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
+				if ( !is_wp_error($upload) )
+					$content = preg_replace( '/<img ([^>]*)src=\\\?(\"|\')' . preg_quote( htmlspecialchars( $image ), '/' ) . '\\\?(\2)([^>\/]*)\/*>/is', $upload, $content );
+			}
+		}
+	}
+
+	// set the post_content and status
+	$post['post_content'] = $content;
+	if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
+		$post['post_status'] = 'publish';
+	elseif ( isset( $_POST['review'] ) )
+		$post['post_status'] = 'pending';
+	else
+		$post['post_status'] = 'draft';
+
+	// error handling for media_sideload
+	if ( is_wp_error( $upload ) ) {
+		wp_delete_post( $post_ID );
+		wp_die( $upload );
+	} else {
+		// Post formats
+		if ( isset( $_POST['post_format'] ) ) {
+			if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
+				set_post_format( $post_ID, $_POST['post_format'] );
+			elseif ( '0' == $_POST['post_format'] )
+				set_post_format( $post_ID, false );
+		}
+
+		$post_ID = wp_update_post($post);
+	}
+
+	return $post_ID;
+}
+
+/**
+ * Retrieve all image URLs from given URI.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since 2.6.0
+ *
+ * @param string $uri
+ * @return string
+ */
+function get_images_from_uri( $uri ) {
+	$uri = preg_replace( '/\/#.+?$/', '', $uri );
+	if ( preg_match( '/\.(jpe?g|jpe|gif|png)\b/i', $uri ) && ! strpos( $uri, 'blogger.com' ) )
+		return "'" . esc_attr( html_entity_decode( $uri ) ) . "'";
+
+	$content = wp_remote_fopen( $uri );
+	if ( false === $content )
+		return '';
+
+	$host = parse_url($uri);
+	$pattern = '/<img ([^>]*)src=(\"|\')([^<>\'\"]+)(\2)([^>]*)\/*>/i';
+	$content = str_replace( array("\n","\t","\r"), '', $content );
+	preg_match_all( $pattern, $content, $matches );
+	if ( empty($matches[0]) )
+		return '';
+
+	$sources = array();
+	foreach ( $matches[3] as $src ) {
+		// if no http in url
+		if ( strpos( $src, 'http' ) === false )
+			// if it doesn't have a relative uri
+			if ( strpos( $src, '../' ) === false && strpos( $src, './' ) === false && strpos( $src, '/' ) === 0 )
+				$src = 'http://' . str_replace( '//', '/', $host['host'] . '/' . $src );
+			else
+				$src = 'http://' . str_replace( '//', '/', $host['host'] . '/' . dirname( $host['path'] ) . '/' . $src );
+		$sources[] = esc_url( $src );
+	}
+	return "'" . implode( "','", $sources ) . "'";
+}
+
+
+function press_this_ajax( $ajax ){
+	global $title, $url, $image, $selection;
+
+	switch ( $ajax ) {
+		case 'video': ?>
+			<script>
+			/* <![CDATA[ */
+				jQuery('.select').click(function() {
+					append_editor(jQuery('#embed-code').val());
+					jQuery('#extra-fields').hide();
+					jQuery('#extra-fields').html('');
+				});
+				jQuery('.close').click(function() {
+					jQuery('#extra-fields').hide();
+					jQuery('#extra-fields').html('');
+				});
+			/* ]]> */
+			</script>
+			<div class="postbox">
+				<h2><label for="embed-code"><?php _e( 'Embed Code' ) ?></label></h2>
+				<div class="inside">
+					<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo esc_textarea( $selection ); ?></textarea>
+					<p id="options">
+						<a href="#" class="select button"><?php _e( 'Insert Video' ); ?></a>
+						<a href="#" class="close button"><?php _e( 'Cancel' ); ?></a>
+					</p>
+				</div>
+			</div>
+			<?php break;
+
+		case 'photo_thickbox': ?>
+			<script>
+				/* <![CDATA[ */
+				jQuery('.cancel').click(function() {
+					tb_remove();
+				});
+				jQuery('.select').click(function() {
+					image_selector(this);
+				});
+				/* ]]> */
+			</script>
+			<h3 class="tb"><label for="tb_this_photo_description"><?php _e( 'Description' ) ?></label></h3>
+			<div class="titlediv">
+				<div class="titlewrap">
+					<input id="tb_this_photo_description" name="photo_description" class="tb_this_photo_description tbtitle text" onkeypress="if(event.keyCode==13) image_selector(this);" value="<?php echo esc_attr( $title );?>"/>
+				</div>
+			</div>
+
+			<p class="centered">
+				<input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="tb_this_photo" class="tb_this_photo" />
+				<a href="#" class="select">
+					<img src="<?php echo esc_url($image); ?>" alt="<?php echo esc_attr( __( 'Click to insert.' ) ); ?>" title="<?php echo esc_attr( __( 'Click to insert.' ) ); ?>" />
+				</a>
+			</p>
+
+			<p id="options">
+				<a href="#" class="select button"><?php _e( 'Insert Image' ); ?></a>
+				<a href="#" class="cancel button"><?php _e( 'Cancel' ); ?></a>
+			</p>
+			<?php break;
+		case 'photo_images':
+			$url = wp_kses( urldecode( $url ), null );
+			echo 'new Array(' . get_images_from_uri( $url ) . ')';
+			break;
+		case 'photo_js': ?>
+			// gather images and load some default JS
+			var last = null
+			var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
+			if(photostorage == false) {
+			var my_src = eval(
+				jQuery.ajax({
+					type: "GET",
+					url: "<?php echo esc_url( $_SERVER['PHP_SELF'] ); ?>",
+					cache : false,
+					async : false,
+					data: "ajax=photo_images&u=<?php echo urlencode( $url ); ?>",
+					dataType : "script"
+				}).responseText
+			);
+			if(my_src.length == 0) {
+				var my_src = eval(
+					jQuery.ajax({
+						type: "GET",
+						url: "<?php echo esc_url( $_SERVER['PHP_SELF'] ); ?>",
+						cache : false,
+						async : false,
+						data: "ajax=photo_images&u=<?php echo urlencode( $url ); ?>",
+						dataType : "script"
+					}).responseText
+				);
+				if(my_src.length == 0) {
+					strtoappend = '<?php _e( 'Unable to retrieve images or no images on page.' ); ?>';
+				}
+			}
+			}
+			for (i = 0; i < my_src.length; i++) {
+				img = new Image();
+				img.src = my_src[i];
+				img_attr = 'id="img' + i + '"';
+				skip = false;
+	
+				maybeappend = '<a href="?ajax=photo_thickbox&amp;i=' + encodeURIComponent(img.src) + '&amp;u=<?php echo urlencode($url); ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
+	
+				if (img.width && img.height) {
+					if (img.width >= 30 && img.height >= 30) {
+						aspect = img.width / img.height;
+						scale = (aspect > 1) ? (71 / img.width) : (71 / img.height);
+	
+						w = img.width;
+						h = img.height;
+	
+						if (scale < 1) {
+							w = parseInt(img.width * scale);
+							h = parseInt(img.height * scale);
+						}
+						img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
+						strtoappend += maybeappend;
+					}
+				} else {
+					strtoappend += maybeappend;
+				}
+			}
+	
+			function pick(img, desc) {
+				if (img) {
+					if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length;
+					if(length == 0) length = 1;
+					jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
+					jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
+					insert_editor( "\n\n" + encodeURI('<p style="text-align: center;"><a href="<?php echo $url; ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>'));
+				}
+				return false;
+			}
+	
+			function image_selector(el) {
+				var desc, src, parent = jQuery(el).closest('#photo-add-url-div');
+	
+				if ( parent.length ) {
+					desc = parent.find('input.tb_this_photo_description').val() || '';
+					src = parent.find('input.tb_this_photo').val() || ''
+				} else {
+					desc = jQuery('#tb_this_photo_description').val() || '';
+					src = jQuery('#tb_this_photo').val() || ''
+				}
+	
+				tb_remove();
+				pick(src, desc);
+				jQuery('#extra-fields').hide();
+				jQuery('#extra-fields').html('');
+				return false;
+			}
+	
+			jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e( 'click images to select' ) ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="button"><?php _e( 'Add from URL' ) ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e( 'Cancel' ); ?></a><a href="#" class="refresh button"><?php _e( 'Refresh' ); ?></a></p></div>');
+			jQuery('#img_container').html(strtoappend);
+			<?php break;
+	}
+	exit;
+}
+
+function press_this_media_buttons() {
+	_e( 'Add:' );
+
+	if ( current_user_can( 'upload_files' ) ) {
+		add_action( 'admin_footer', 'press_this_add_photo_by_url_div' );
+		?>
+		<a id="photo_button" title="<?php esc_attr_e('Insert an Image'); ?>" href="javascript:;">
+			<img src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>" width="14" height="12" alt="<?php esc_attr_e( 'Insert an Image' ); ?>" />
+		</a>
+		<?php
+	}
+	?>
+
+	<a id="video_button" title="<?php esc_attr_e( 'Embed a Video' ); ?>" href="javascript:;">
+		<img src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>" width="13" height="12" alt="<?php esc_attr_e( 'Embed a Video' ); ?>" />
+	</a>
+	<?php
+}
+
+function press_this_add_photo_by_url_div() {
+	?>
+	<div id="photo-add-url-div" style="display:none;">
+		<table>
+			<tr>
+				<th scope="row"><label for="this_photo"><?php _e( 'URL' ) ?></label></th>
+				<td><input type="text" id="this_photo" name="this_photo" class="tb_this_photo text" onkeypress="if(event.keyCode==13) image_selector(this);" /></td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="this_photo_description"><?php _e( 'Description' ) ?></label></th>
+				<td><input type="text" id="this_photo_description" name="photo_description" class="tb_this_photo_description text" onkeypress="if(event.keyCode==13) image_selector(this);" value="<?php echo esc_attr($title);?>"/></td>
+			</tr>
+			<tr>
+				<td></td>
+				<td><input type="button" class="button" onclick="image_selector(this)" value="<?php esc_attr_e( 'Insert Image' ); ?>" /></td>
+			</tr>
+		</table>
+	</div>
+	<?php
+}
Index: wp-admin/press-this.php
===================================================================
--- wp-admin/press-this.php	(revision 21499)
+++ wp-admin/press-this.php	(working copy)
@@ -9,312 +9,80 @@
 define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
-header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+header( 'Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset') );
 
 if ( ! current_user_can('edit_posts') )
 	wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-/**
- * Press It form handler.
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 2.6.0
- *
- * @return int Post ID
- */
-function press_it() {
+require_once( './includes/press-this.php' );
 
-	$post = get_default_post_to_edit();
-	$post = get_object_vars($post);
-	$post_ID = $post['ID'] = (int) $_POST['post_id'];
+define( 'PRESS_THIS_POST_TYPE', 'post' );
 
-	if ( !current_user_can('edit_post', $post_ID) )
-		wp_die(__('You are not allowed to edit this post.'));
-
-	$post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : '';
-	$post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : '';
-	$post['post_title'] = isset($_POST['title']) ? $_POST['title'] : '';
-	$content = isset($_POST['content']) ? $_POST['content'] : '';
-
-	$upload = false;
-	if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
-		foreach( (array) $_POST['photo_src'] as $key => $image) {
-			// see if files exist in content - we don't want to upload non-used selected files.
-			if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
-				$desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
-				$upload = media_sideload_image($image, $post_ID, $desc);
-
-				// Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
-				if ( !is_wp_error($upload) )
-					$content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
-			}
-		}
-	}
-	// set the post_content and status
-	$post['post_content'] = $content;
-	if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
-		$post['post_status'] = 'publish';
-	elseif ( isset( $_POST['review'] ) )
-		$post['post_status'] = 'pending';
-	else
-		$post['post_status'] = 'draft';
-
-	// error handling for media_sideload
-	if ( is_wp_error($upload) ) {
-		wp_delete_post($post_ID);
-		wp_die($upload);
-	} else {
-		// Post formats
-		if ( isset( $_POST['post_format'] ) ) {
-			if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
-				set_post_format( $post_ID, $_POST['post_format'] );
-			elseif ( '0' == $_POST['post_format'] )
-				set_post_format( $post_ID, false );
-		}
-
-		$post_ID = wp_update_post($post);
-	}
-
-	return $post_ID;
-}
-
 // For submitted posts.
-if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) {
-	check_admin_referer('press-this');
-	$posted = $post_ID = press_it();
+if ( isset($_REQUEST['action'] ) && 'post' == $_REQUEST['action'] ) {
+	check_admin_referer( 'press-this' );
+	$posted = $post_ID = press_it( PRESS_THIS_POST_TYPE );
 } else {
-	$post = get_default_post_to_edit('post', true);
+	$post = get_default_post_to_edit( PRESS_THIS_POST_TYPE, true );
 	$post_ID = $post->ID;
 }
 
 // Set Variables
-$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( stripslashes( $_GET['t'] ) , ENT_QUOTES) ) ) : '';
+$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( stripslashes( $_GET['t'] ), ENT_QUOTES ) ) ) : '';
+$url   = isset( $_GET['u'] ) ? esc_url( $_GET['u'] ) : '';
+$image = isset( $_GET['i'] ) ? $_GET['i'] : '';
 
 $selection = '';
-if ( !empty($_GET['s']) ) {
-	$selection = str_replace('&apos;', "'", stripslashes($_GET['s']));
-	$selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) );
+if ( ! empty( $_GET['s'] ) ) {
+	$selection = str_replace( '&apos;', "'", stripslashes( $_GET['s'] ) );
+	$selection = trim( htmlspecialchars( html_entity_decode( $selection, ENT_QUOTES ) ) );
 }
 
-if ( ! empty($selection) ) {
-	$selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
-	$selection = '<p>' . str_replace('<p></p>', '', $selection) . '</p>';
+if ( ! empty( $selection ) ) {
+	$selection = preg_replace( '/(\r?\n|\r)/', '</p><p>', $selection );
+	$selection = '<p>' . str_replace( '<p></p>', '', $selection ) . '</p>';
 }
 
-$url = isset($_GET['u']) ? esc_url($_GET['u']) : '';
-$image = isset($_GET['i']) ? $_GET['i'] : '';
+if ( ! empty( $_REQUEST['ajax'] ) )
+	press_this_ajax( $_REQUEST['ajax'] );
 
-if ( !empty($_REQUEST['ajax']) ) {
-	switch ($_REQUEST['ajax']) {
-		case 'video': ?>
-			<script type="text/javascript">
-			/* <![CDATA[ */
-				jQuery('.select').click(function() {
-					append_editor(jQuery('#embed-code').val());
-					jQuery('#extra-fields').hide();
-					jQuery('#extra-fields').html('');
-				});
-				jQuery('.close').click(function() {
-					jQuery('#extra-fields').hide();
-					jQuery('#extra-fields').html('');
-				});
-			/* ]]> */
-			</script>
-			<div class="postbox">
-				<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
-				<div class="inside">
-					<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo esc_textarea( $selection ); ?></textarea>
-					<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
-				</div>
-			</div>
-			<?php break;
+_wp_admin_html_begin();
+?>
+<title><?php _e( 'Press This' ) ?></title>
 
-		case 'photo_thickbox': ?>
-			<script type="text/javascript">
-				/* <![CDATA[ */
-				jQuery('.cancel').click(function() {
-					tb_remove();
-				});
-				jQuery('.select').click(function() {
-					image_selector(this);
-				});
-				/* ]]> */
-			</script>
-			<h3 class="tb"><label for="tb_this_photo_description"><?php _e('Description') ?></label></h3>
-			<div class="titlediv">
-				<div class="titlewrap">
-					<input id="tb_this_photo_description" name="photo_description" class="tb_this_photo_description tbtitle text" onkeypress="if(event.keyCode==13) image_selector(this);" value="<?php echo esc_attr($title);?>"/>
-				</div>
-			</div>
+<script>
+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();}}};
+var userSettings = {
+		'url': '<?php echo SITECOOKIEPATH; ?>',
+		'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+		'time':'<?php echo time() ?>'
+	},
+	ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+	pagenow = 'press-this',
+	typenow = '<?php echo PRESS_THIS_POST_TYPE; ?>',
+//	adminpage = '',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	isRtl = <?php echo (int) is_rtl(); ?>,
+	photostorage = false;
+</script>
 
-			<p class="centered">
-				<input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="tb_this_photo" class="tb_this_photo" />
-				<a href="#" class="select">
-					<img src="<?php echo esc_url($image); ?>" alt="<?php echo esc_attr(__('Click to insert.')); ?>" title="<?php echo esc_attr(__('Click to insert.')); ?>" />
-				</a>
-			</p>
 
-			<p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p>
-			<?php break;
-	case 'photo_images':
-		/**
-		 * Retrieve all image URLs from given URI.
-		 *
-		 * @package WordPress
-		 * @subpackage Press_This
-		 * @since 2.6.0
-		 *
-		 * @param string $uri
-		 * @return string
-		 */
-		function get_images_from_uri($uri) {
-			$uri = preg_replace('/\/#.+?$/','', $uri);
-			if ( preg_match( '/\.(jpe?g|jpe|gif|png)\b/i', $uri ) && !strpos( $uri, 'blogger.com' ) )
-				return "'" . esc_attr( html_entity_decode($uri) ) . "'";
-			$content = wp_remote_fopen($uri);
-			if ( false === $content )
-				return '';
-			$host = parse_url($uri);
-			$pattern = '/<img ([^>]*)src=(\"|\')([^<>\'\"]+)(\2)([^>]*)\/*>/i';
-			$content = str_replace(array("\n","\t","\r"), '', $content);
-			preg_match_all($pattern, $content, $matches);
-			if ( empty($matches[0]) )
-				return '';
-			$sources = array();
-			foreach ($matches[3] as $src) {
-				// if no http in url
-				if (strpos($src, 'http') === false)
-					// if it doesn't have a relative uri
-					if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
-						$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
-					else
-						$src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
-				$sources[] = esc_url($src);
-			}
-			return "'" . implode("','", $sources) . "'";
-		}
-		$url = wp_kses(urldecode($url), null);
-		echo 'new Array('.get_images_from_uri($url).')';
-		break;
-
-	case 'photo_js': ?>
-		// gather images and load some default JS
-		var last = null
-		var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
-		if(photostorage == false) {
-		var my_src = eval(
-			jQuery.ajax({
-				type: "GET",
-				url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
-				cache : false,
-				async : false,
-				data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
-				dataType : "script"
-			}).responseText
-		);
-		if(my_src.length == 0) {
-			var my_src = eval(
-				jQuery.ajax({
-					type: "GET",
-					url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
-					cache : false,
-					async : false,
-					data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
-					dataType : "script"
-				}).responseText
-			);
-			if(my_src.length == 0) {
-				strtoappend = '<?php _e('Unable to retrieve images or no images on page.'); ?>';
-			}
-		}
-		}
-		for (i = 0; i < my_src.length; i++) {
-			img = new Image();
-			img.src = my_src[i];
-			img_attr = 'id="img' + i + '"';
-			skip = false;
-
-			maybeappend = '<a href="?ajax=photo_thickbox&amp;i=' + encodeURIComponent(img.src) + '&amp;u=<?php echo urlencode($url); ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
-
-			if (img.width && img.height) {
-				if (img.width >= 30 && img.height >= 30) {
-					aspect = img.width / img.height;
-					scale = (aspect > 1) ? (71 / img.width) : (71 / img.height);
-
-					w = img.width;
-					h = img.height;
-
-					if (scale < 1) {
-						w = parseInt(img.width * scale);
-						h = parseInt(img.height * scale);
-					}
-					img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
-					strtoappend += maybeappend;
-				}
-			} else {
-				strtoappend += maybeappend;
-			}
-		}
-
-		function pick(img, desc) {
-			if (img) {
-				if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length;
-				if(length == 0) length = 1;
-				jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
-				jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
-				insert_editor( "\n\n" + encodeURI('<p style="text-align: center;"><a href="<?php echo $url; ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>'));
-			}
-			return false;
-		}
-
-		function image_selector(el) {
-			var desc, src, parent = jQuery(el).closest('#photo-add-url-div');
-
-			if ( parent.length ) {
-				desc = parent.find('input.tb_this_photo_description').val() || '';
-				src = parent.find('input.tb_this_photo').val() || ''
-			} else {
-				desc = jQuery('#tb_this_photo_description').val() || '';
-				src = jQuery('#tb_this_photo').val() || ''
-			}
-
-			tb_remove();
-			pick(src, desc);
-			jQuery('#extra-fields').hide();
-			jQuery('#extra-fields').html('');
-			return false;
-		}
-
-		jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
-		jQuery('#img_container').html(strtoappend);
-		<?php break;
-}
-die;
-}
-
+<?php
 	wp_enqueue_style( 'colors' );
 	wp_enqueue_script( 'post' );
-	_wp_admin_html_begin();
+	do_action( 'admin_enqueue_scripts', 'press-this.php' );
+	do_action( 'admin_print_styles-press-this.php' );
+	do_action( 'admin_print_styles' );
+	do_action( 'admin_print_scripts-press-this.php' );
+	do_action( 'admin_print_scripts' );
+	do_action( 'admin_head-press-this.php' ); 
+	do_action( 'admin_head' );
 ?>
-<title><?php _e('Press This') ?></title>
-<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();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'press-this', isRtl = <?php echo (int) is_rtl(); ?>;
-var photostorage = false;
-//]]>
-</script>
 
-<?php
-	do_action('admin_print_styles');
-	do_action('admin_print_scripts');
-	do_action('admin_head');
-?>
-	<script type="text/javascript">
+	<script>
 	var wpActiveEditor = 'content';
 
 	function insert_plain_editor(text) {
@@ -350,17 +118,17 @@
 				jQuery('#extra-fields').load('<?php echo esc_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo esc_attr($selection); ?>'}, function() {
 					<?php
 					$content = '';
-					if ( preg_match("/youtube\.com\/watch/i", $url) ) {
-						list($domain, $video_id) = explode("v=", $url);
-						$video_id = esc_attr($video_id);
+					if ( preg_match( '/youtube\.com\/watch/i', $url) ) {
+						list( $domain, $video_id ) = explode( 'v=', $url );
+						$video_id = esc_attr( $video_id );
 						$content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
 
-					} elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
-						list($domain, $video_id) = explode(".com/", $url);
-						$video_id = esc_attr($video_id);
+					} elseif ( preg_match( '/vimeo\.com\/[0-9]+/i', $url ) ) {
+						list( $domain, $video_id ) = explode( '.com/', $url );
+						$video_id = esc_attr( $video_id );
 						$content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />	<embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
 
-						if ( trim($selection) == '' )
+						if ( trim( $selection ) == '' )
 							$selection = '<p><a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a></p>';
 
 					} elseif ( strpos( $selection, '<object' ) !== false ) {
@@ -419,13 +187,13 @@
 		jQuery('#photo_button').click(function() { show('photo'); return false; });
 		jQuery('#video_button').click(function() { show('video'); return false; });
 		// auto select
-		<?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
+		<?php if ( preg_match( '/youtube\.com\/watch/i', $url ) ): ?>
 			show('video');
-		<?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
+		<?php elseif ( preg_match( '/vimeo\.com\/[0-9]+/i', $url ) ): ?>
 			show('video');
-		<?php } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
+		<?php elseif ( preg_match( '/flickr\.com/i', $url ) ): ?>
 			show('photo');
-		<?php } ?>
+		<?php endif; ?>
 		jQuery('#title').unbind();
 		jQuery('#publish, #save').click(function() { jQuery('#saving').css('display', 'inline'); });
 
@@ -444,7 +212,7 @@
 <div id="poststuff" class="metabox-holder">
 	<div id="side-sortables" class="press-this-sidebar">
 		<div class="sleeve">
-			<?php wp_nonce_field('press-this') ?>
+			<?php wp_nonce_field( 'press-this' ) ?>
 			<input type="hidden" name="post_type" id="post_type" value="text"/>
 			<input type="hidden" name="autosave" id="autosave" />
 			<input type="hidden" id="original_post_status" name="original_post_status" value="draft" />
@@ -456,18 +224,18 @@
 
 			<div id="submitdiv" class="postbox">
 				<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
-				<h3 class="hndle"><?php _e('Press This') ?></h3>
+				<h3 class="hndle"><?php _e( 'Press This' ) ?></h3>
 				<div class="inside">
 					<p id="publishing-actions">
 					<?php
 						submit_button( __( 'Save Draft' ), 'button', 'draft', false, array( 'id' => 'save' ) );
-						if ( current_user_can('publish_posts') ) {
+						if ( current_user_can( 'publish_posts' ) ) {
 							submit_button( __( 'Publish' ), 'primary', 'publish', false );
 						} else {
 							echo '<br /><br />';
 							submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
 						} ?>
-						<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
+						<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" height="16" width="16" alt="" id="saving" style="display:none;" />
 					</p>
 					<?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
 							$post_formats = get_theme_support( 'post-formats' );
@@ -490,7 +258,7 @@
 			<?php $tax = get_taxonomy( 'category' ); ?>
 			<div id="categorydiv" class="postbox">
 				<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
-				<h3 class="hndle"><?php _e('Categories') ?></h3>
+				<h3 class="hndle"><?php _e( 'Categories' ) ?></h3>
 				<div class="inside">
 				<div id="taxonomy-category" class="categorydiv">
 
@@ -512,7 +280,7 @@
 					</div>
 
 					<?php if ( !current_user_can($tax->cap->assign_terms) ) : ?>
-					<p><em><?php _e('You cannot modify this Taxonomy.'); ?></em></p>
+					<p><em><?php _e( 'You cannot modify this Taxonomy.' ); ?></em></p>
 					<?php endif; ?>
 					<?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
 						<div id="category-adder" class="wp-hidden-children">
@@ -540,20 +308,20 @@
 
 			<div id="tagsdiv-post_tag" class="postbox">
 				<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
-				<h3><span><?php _e('Tags'); ?></span></h3>
+				<h3><span><?php _e( 'Tags' ); ?></span></h3>
 				<div class="inside">
 					<div class="tagsdiv" id="post_tag">
 						<div class="jaxtag">
-							<label class="screen-reader-text" for="newtag"><?php _e('Tags'); ?></label>
+							<label class="screen-reader-text" for="newtag"><?php _e( 'Tags' ); ?></label>
 							<input type="hidden" name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]" value="" />
 							<div class="ajaxtag">
 								<input type="text" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
-								<input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" />
+								<input type="button" class="button tagadd" value="<?php esc_attr_e( 'Add' ); ?>" />
 							</div>
 						</div>
 						<div class="tagchecklist"></div>
 					</div>
-					<p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags'); ?></a></p>
+					<p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e( 'Choose from the most used tags' ); ?></a></p>
 				</div>
 			</div>
 		</div>
@@ -563,8 +331,8 @@
 		<div id="wphead">
 			<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="16" height="16" />
 			<h1 id="site-heading">
-				<a href="<?php echo get_option('home'); ?>/" target="_blank">
-					<span id="site-title"><?php bloginfo('name'); ?></span>
+				<a href="<?php echo get_option( 'home' ); ?>/" target="_blank">
+					<span id="site-title"><?php bloginfo( 'name' ); ?></span>
 				</a>
 			</h1>
 		</div>
@@ -573,20 +341,20 @@
 		if ( isset($posted) && intval($posted) ) {
 			$post_ID = intval($posted); ?>
 			<div id="message" class="updated">
-			<p><strong><?php _e('Your post has been saved.'); ?></strong>
+			<p><strong><?php _e( 'Your post has been saved.' ); ?></strong>
 			<a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink($post_ID); ?>"><?php _e('View post'); ?></a>
 			| <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a>
-			| <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p>
+			| <a href="#" onclick="window.close();"><?php _e( 'Close Window' ); ?></a></p>
 			</div>
 		<?php } ?>
 
 		<div id="titlediv">
 			<div class="titlewrap">
-				<input name="title" id="title" class="text" value="<?php echo esc_attr($title);?>"/>
+				<input name="title" id="title" class="text" value="<?php echo esc_attr( $title );?>"/>
 			</div>
 		</div>
 
-		<div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php esc_html_e( 'Loading...' ); ?></div>
+		<div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" height="16" width="16" alt="" /> <?php esc_html_e( 'Loading...' ); ?></div>
 
 		<div id="extra-fields" style="display: none"></div>
 
@@ -598,7 +366,7 @@
 			'textarea_rows' => '15'
 		);
 
-		$content = '';
+		$content = empty( $post ) ? '' : $post->post_content;
 		if ( $selection )
 			$content .= $selection;
 
@@ -608,25 +376,12 @@
 			if ( $selection )
 				$content .= __('via ');
 
-			$content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
+			$content .= sprintf( '<a href="%s">%s</a>.</p>', esc_url( $url ), esc_html( $title ) );
 		}
 
 		remove_action( 'media_buttons', 'media_buttons' );
 		add_action( 'media_buttons', 'press_this_media_buttons' );
-		function press_this_media_buttons() {
-			_e( 'Add:' );
 
-			if ( current_user_can('upload_files') ) {
-				?>
-				<a id="photo_button" title="<?php esc_attr_e('Insert an Image'); ?>" href="#">
-				<img alt="<?php esc_attr_e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a>
-				<?php
-			}
-			?>
-			<a id="video_button" title="<?php esc_attr_e('Embed a Video'); ?>" href="#"><img alt="<?php esc_attr_e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>"/></a>
-			<?php
-		}
-
 		wp_editor( $content, 'content', $editor_settings );
 
 		?>
@@ -634,21 +389,11 @@
 	</div>
 </div>
 </form>
-<div id="photo-add-url-div" style="display:none;">
-	<table><tr>
-	<td><label for="this_photo"><?php _e('URL') ?></label></td>
-	<td><input type="text" id="this_photo" name="this_photo" class="tb_this_photo text" onkeypress="if(event.keyCode==13) image_selector(this);" /></td>
-	</tr><tr>
-	<td><label for="this_photo_description"><?php _e('Description') ?></label></td>
-	<td><input type="text" id="this_photo_description" name="photo_description" class="tb_this_photo_description text" onkeypress="if(event.keyCode==13) image_selector(this);" value="<?php echo esc_attr($title);?>"/></td>
-	</tr><tr>
-	<td><input type="button" class="button" onclick="image_selector(this)" value="<?php esc_attr_e('Insert Image'); ?>" /></td>
-	</tr></table>
-</div>
 <?php
-do_action('admin_footer');
-do_action('admin_print_footer_scripts');
+	do_action( 'admin_footer', '' );
+	do_action( 'admin_print_footer_scripts' );
+	do_action( 'admin_footer-press-this.php' );
 ?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+<script>if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>