X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..312084b5d95c21feb519ff03decf948420e1f6fa:/wp-admin/press-this.php

diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 8bd6ce28..4eda788c 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -1,70 +1,80 @@
 <?php
+/**
+ * Press This Display and Handler.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ */
+
+/** WordPress Administration Bootstrap */
 require_once('admin.php');
-
-if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-function preg_quote2($string) {
-	return str_replace('/', '\/', preg_quote($string));
-}
+header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+
+if ( ! current_user_can('edit_posts') )
+	wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+/**
+ * Convert characters.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since 2.6.0
+ *
+ * @param string $text
+ * @return string
+ */
 function aposfix($text) {
 	$translation_table[chr(34)] = '&quot;';
 	$translation_table[chr(38)] = '&';
 	$translation_table[chr(39)] = '&apos;';
 	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($text, $translation_table));
 }
+
+/**
+ * Press It form handler.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since 2.6.0
+ *
+ * @return int Post ID
+ */
 function press_it() {
 	// define some basic variables
-	$quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft';
-	$quick['post_category'] = $_REQUEST['post_category'];
-	$quick['tags_input'] = $_REQUEST['tags_input'];
-	$quick['post_title'] = $_REQUEST['post_title'];
-	$quick['post_content'] = '';
+	$quick['post_status'] = 'draft'; // set as draft first
+	$quick['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
+	$quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
+	$quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : '  ';
+	$quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 
 
 	// insert the post with nothing in it, to get an ID
 	$post_ID = wp_insert_post($quick, true);
-
-	$content = '';
-	switch ( $_REQUEST['post_type'] ) {
-		case 'text':
-		case 'quote':
-			$content .= $_REQUEST['content'];
-			break;
-
-		case 'photo':
-			$content = $_REQUEST['content'];
-
-			foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
-				
-				// see if files exist in content - we don't want to upload non-used selected files.
-				if( strpos($_REQUEST['content'], $image) !== false ) {
-					$upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
-					 
-					// Replace the POSTED content <img> with correct uploaded ones.
-					// escape quote for matching
-					$quoted = preg_quote2($image);
-					if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
-				}
+	if ( is_wp_error($post_ID) )
+		wp_die($post_ID);
+
+	$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);
 			}
-
-			break;
-
-		case "video":
-			if($_REQUEST['embed_code']) 
-				$content .= $_REQUEST['embed_code']."\n\n";
-			$content .= $_REQUEST['content'];
-			break;
 		}
-	// set the post_content
+	}
+	// set the post_content and status
+	$quick['post_status'] = isset($_POST['publish']) ? 'publish' : 'draft';
 	$quick['post_content'] = $content;
-
-	// error handling for $post
-	if ( is_wp_error($post_ID)) {
-		wp_die($id);
-		wp_delete_post($post_ID);
 	// error handling for media_sideload
-	} elseif ( is_wp_error($upload)) {
-		wp_die($upload);
+	if ( is_wp_error($upload) ) {
 		wp_delete_post($post_ID);
+		wp_die($upload);
 	} else {
 		$quick['ID'] = $post_ID;
 		wp_update_post($quick);
@@ -73,215 +83,232 @@ function press_it() {
 }
 
 // For submitted posts.
-if ( 'post' == $_REQUEST['action'] ) { 
-	check_admin_referer('press-this'); $post_ID = press_it(); ?>
-	<!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 _e('Press This') ?></title>
-	<?php
-		add_thickbox();
-		wp_enqueue_style('press-this');
-		wp_enqueue_style('press-this-ie');
-		wp_enqueue_style( 'colors' );
-		wp_enqueue_script('post');
-
-		do_action('admin_print_styles');
-		do_action('admin_print_scripts');
-		do_action('admin_head');
-	?>
-	</head>
-	<body class="press-this">
-		<div id="message" class="updated fade"><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="post.php?action=edit&amp;post=<?php echo $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></div>
-		<div id="footer">
-		<p><?php
-		do_action('in_admin_footer', '');
-		$upgrade = apply_filters( 'update_footer', '' );
-		echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>');
-		?></p>
-		</div>
-		<?php do_action('admin_footer', ''); ?>
-	</body>
-	</html>
-	<?php die;
+if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) {
+	check_admin_referer('press-this');
+	$post_ID = press_it();
+	$posted =  $post_ID;
+} else {
+	$post_ID = 0;
 }
 
-// Ajax Requests
-$title = wp_specialchars(aposfix(stripslashes($_GET['t'])));
-
-$selection = trim( aposfix( stripslashes($_GET['s']) ) );
+// Set Variables
+$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
+$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
 if ( ! empty($selection) ) {
 	$selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
 	$selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
 }
 
-$url = clean_url($_GET['u']);
-$image = $_GET['i'];
-
-if($_REQUEST['ajax'] == 'thickbox') { ?>
-	<script type="text/javascript" charset="utf-8">
-		jQuery('.cancel').click(function() {
-			tb_remove();
-		});
+$url = isset($_GET['u']) ? esc_url($_GET['u']) : '';
+$image = isset($_GET['i']) ? $_GET['i'] : '';
+
+if ( !empty($_REQUEST['ajax']) ) {
+	switch ($_REQUEST['ajax']) {
+		case 'video': ?>
+			<script type="text/javascript" charset="utf-8">
+			/* <![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 wp_htmledit_pre( $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;
 
-		jQuery('.select').click(function() {
-			image_selector();
-		});
-	</script>
-	<h3 id="title"><label for="post_title"><?php _e('Description') ?></label></h3>
-	<div class="titlewrap">
-		<input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
-	</div>
+		case 'photo_thickbox': ?>
+			<script type="text/javascript" charset="utf-8">
+				/* <![CDATA[ */
+				jQuery('.cancel').click(function() {
+					tb_remove();
+				});
+				jQuery('.select').click(function() {
+					image_selector();
+				});
+				/* ]]> */
+			</script>
+			<h3 class="tb"><label for="this_photo_description"><?php _e('Description') ?></label></h3>
+			<div class="titlediv">
+				<div class="titlewrap">
+					<input id="this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/>
+				</div>
+			</div>
 
-	<p class="centered"><input type="hidden" name="this_photo" value="<?php echo attribute_escape($image); ?>" id="this_photo" />
-		<a href="#" class="select"><img src="<?php echo clean_url($image); ?>" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p>
+			<p class="centered">
+				<input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="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 die; 
-}
+			<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;
 
-if($_REQUEST['ajax'] == 'thickbox_url') { ?>
-	<script type="text/javascript" charset="utf-8">
-		jQuery('.cancel').click(function() {
-			tb_remove();
-		});
+		case 'photo_thickbox_url': ?>
+			<script type="text/javascript" charset="utf-8">
+				/* <![CDATA[ */
+				jQuery('.cancel').click(function() {
+					tb_remove();
+				});
 
-		jQuery('.select').click(function() {
-			image_selector();
-		});
-	</script>
-	<h3 id="title"><label for="post_title"><?php _e('URL') ?></label></h3>
-	<div class="titlewrap">
-		<input id="this_photo" name="this_photo" class="text" onkeypress="if(event.keyCode==13) image_selector();" />
-	</div>
+				jQuery('.select').click(function() {
+					image_selector();
+				});
+				/* ]]> */
+			</script>
+			<h3 class="tb"><label for="this_photo"><?php _e('URL') ?></label></h3>
+			<div class="titlediv">
+				<div class="titlewrap">
+					<input id="this_photo" name="this_photo" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" />
+				</div>
+			</div>
+			<h3 class="tb"><label for="photo_description"><?php _e('Description') ?></label></h3>
+			<div id="titlediv">
+				<div class="titlewrap">
+					<input id="this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/>
+				</div>
+			</div>
 
+			<p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?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('/\.(jpg|jpe|jpeg|png|gif)$/', $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_attr($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;
 
-	<h3 id="title"><label for="post_title"><?php _e('Description') ?></label></h3>
-	<div class="titlewrap">
-		<input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
-	</div>
+			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>';
 
-	<p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
-<?php die; 
-}
+			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);
 
-if($_REQUEST['ajax'] == 'video') { ?>
-	<h2 id="embededcode"><label for="embed_code"><?php _e('Embed Code') ?></label></h2>
-	<div class="titlewrap" >
-		<textarea name="embed_code" id="embed_code" rows="8" cols="40"><?php echo format_to_edit($selection); ?></textarea>
-	</div>
-<?php die;
-}
+					w = img.width;
+					h = img.height;
 
-if($_REQUEST['ajax'] == 'photo_images') {
-	function get_images_from_uri($uri) {
-		if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') ) 
-			return "'".$uri."'";
-
-		$content = wp_remote_fopen($uri);
-		if ( false === $content ) return '';
-
-		$host = parse_url($uri);
-
-		$pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is';
-		preg_match_all($pattern, $content, $matches);
-		
-		if ( empty($matches[1]) ) 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, '/') === true)
-					$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
-				else
-					$src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
-			
-			$sources[] = clean_url($src);
+					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;
+			}
 		}
-		return "'" . implode("','", $sources) . "'";
-	} 
-
-	$url = urldecode($url);
-	$url = str_replace(' ', '%20', $url);
-	echo 'new Array('.get_images_from_uri($url).')'; 
-die;
-}
 
-if($_REQUEST['ajax'] == 'photo_js') { ?>
- 	// gather images and load some default JS
-	var last = null
-	var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
-	var my_src = eval(
-		jQuery.ajax({
-	   		type: "GET",
-	   		url: "<?php echo clean_url($_SERVER['PHP_SELF']); ?>",
-			cache : false,
-			async : false,
-	   		data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
-			dataType : "script"
-		}).responseText
-	);
-
-	for (i = 0; i < my_src.length; i++) {
-		img = new Image(); 
-		img.src = my_src[i]; 
-		img_attr = 'id="img' + i + '"'; 
-		skip = false;
-		if (img.width && img.height) {
-			if (img.width * img.height < 2500) 
-				skip = true;
-			aspect = img.width / img.height;
-			scale = (aspect > 1) ? (75 / img.width) : (75 / img.height);
-
-			w = img.width;
-			h = img.height;
-
-			if (scale < 1) {
-				w = parseInt(img.width * scale);
-				h = parseInt(img.height * scale);
+		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>'));
 			}
-			img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
+			return false;
 		}
-		if (!skip) strtoappend += '<a href="?ajax=thickbox&amp;i=' + img.src + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
-	}
 
-	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"/>');
-			append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" class="aligncenter"/></p>');
+		function image_selector() {
+			tb_remove();
+			desc = jQuery('#this_photo_description').val();
+			src = jQuery('#this_photo').val();
+			pick(src, desc);
+			jQuery('#extra-fields').hide();
+			jQuery('#extra-fields').html('');
+			return false;
 		}
-		tinyMCE.activeEditor.resizeToContent();
-		return false;
-	}
-
-	function image_selector() {
-		tb_remove();
-		desc = jQuery('#this_photo_description').val();
-		src = jQuery('#this_photo').val();
-		pick(src, desc);
-		return false;
-	}
-
-	jQuery(document).ready(function() {
-		jQuery('#extra_fields').html('<div class="photolist"></div><small id="photo_directions"><?php _e("Click images to select:") ?> <span><a href="#" id="photo_add_url" class="thickbox"><?php _e("Add from URL") ?> +</a></span></small><div class="titlewrap"><div id="img_container"></div></div>');
-		jQuery('#img_container').html(strtoappend);
-		jQuery('#photo_add_url').attr('href', '?ajax=thickbox_url&height=200&width=500');
-		tb_init('a.thickbox, area.thickbox, input.thickbox');
-	});
-
-<?php die;
+			jQuery('#extra-fields').html('<div class="postbox"><h2>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="thickbox 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;
 }
-
-if($_REQUEST['ajax'] == 'photo') { ?>
-
-<?php die;
+die;
 }
+
 ?>
 <!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(); ?>>
@@ -289,136 +316,71 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 	<title><?php _e('Press This') ?></title>
 
-	<script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script>
 <?php
 	add_thickbox();
-	wp_enqueue_style('press-this');
-	wp_enqueue_style('press-this-ie');
+	wp_enqueue_style( 'press-this' );
+	wp_enqueue_style( 'press-this-ie');
 	wp_enqueue_style( 'colors' );
-	wp_enqueue_script('post');
-	wp_enqueue_script('editor_functions');
+	wp_enqueue_script( 'post' );
+	wp_enqueue_script( 'editor' );
+?>
+<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'); ?>', pagenow = 'press-this';
+var photostorage = false;
+//]]>
+</script>
 
+<?php
 	do_action('admin_print_styles');
 	do_action('admin_print_scripts');
 	do_action('admin_head');
+
+	if ( user_can_richedit() )
+		wp_tiny_mce( true, array( 'height' => '370' ) );
 ?>
 	<script type="text/javascript">
-	<?php if ( user_can_richedit() ) { 
-		$language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
-		// Add TinyMCE languages
-		@include_once( dirname(__FILE__).'/../wp-includes/js/tinymce/langs/wp-langs.php' );
-		if ( isset($strings) ) echo $strings; ?>
-			(function() {
-				var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "<?php echo $language; ?>";
-				sl.markDone(base + '/langs/' + ln + '.js');
-				sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
-				sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
-			})();
-
-			tinyMCE.init({
-				mode: "textareas",
-				editor_selector: "mceEditor",
-				language : "<?php echo $language; ?>",
-				width: "100%",
-				height: "300",
-				theme : "advanced",
-				theme_advanced_buttons1 : "bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink",
-				theme_advanced_buttons2 : "",
-				theme_advanced_buttons3 : "",
-				theme_advanced_toolbar_location : "top",
-				theme_advanced_toolbar_align : "left",
-				theme_advanced_statusbar_location : "bottom",
-				theme_advanced_resizing : true,
-				theme_advanced_resize_horizontal : false,
-				skin : "wp_theme",
-				dialog_type : "modal",
-				relative_urls : false,
-				remove_script_host : false,
-				convert_urls : false,
-				apply_source_formatting : false,
-				remove_linebreaks : true,
-				accessibility_focus : false,
-				tab_focus : ":next",
-				plugins : "safari,inlinepopups",
-				entities : "38,amp,60,lt,62,gt",
-				force_p_newlines : true,
-				save_callback : 'switchEditors.saveCallback'
-			});
-    <?php } ?>
-
-    jQuery('#tags-input').hide();
-
-	tag_update_quickclicks();
-
-	// add the quickadd form
-	jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="submit" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" onclick="return false;" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
-
-	jQuery('#tagadd').click( tag_flush_to_text );
-	jQuery('#newtag').focus(function() {
-		if ( this.value == postL10n.addTag )
-			jQuery(this).val( '' ).removeClass( 'form-input-tip' );
-	});
-	jQuery('#newtag').blur(function() {
-		if ( this.value == '' ) 
-			jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
-	});
-
-	// auto-save tags on post save/publish
-	jQuery('#publish').click( tag_save_on_publish );
-	jQuery('#save-post').click( tag_save_on_publish );
-
-	function set_menu(type) {
-		jQuery('#text_button').removeClass('ui-tabs-selected');
-		jQuery('#menu li').removeClass('ui-tabs-selected');
-		jQuery('#' + type + '_button').addClass('ui-tabs-selected');
-		jQuery("#post_type").val(type);
+	function insert_plain_editor(text) {
+		edCanvas = document.getElementById('content');
+		edInsertContent(edCanvas, text);
 	}
-
 	function set_editor(text) {
 		if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
 		if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, text);
 	}
-
+	function insert_editor(text) {
+		if ( '' != text && tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden()) {
+			tinyMCE.execCommand('mceInsertContent', false, '<p>' + decodeURI(tinymce.DOM.decode(text)) + '</p>', {format : 'raw'});
+		} else {
+			insert_plain_editor(decodeURI(text));
+		}
+	}
 	function append_editor(text) {
-		if ( '' != text && tinyMCE.activeEditor ) tinyMCE.execCommand('mceInsertContent', false, text);
+		if ( '' != text && tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden()) {
+			tinyMCE.execCommand('mceSetContent', false, tinyMCE.activeEditor.getContent({format : 'raw'}) + '<p>' + text + '</p>');
+			tinyMCE.execCommand('mceCleanup');
+		} else {
+			insert_plain_editor(text);
+		}
 	}
 
-	function set_title(title) { jQuery("#content_type").text(title); }
-
 	function show(tab_name) {
-		jQuery('body').removeClass('video_split');
-		jQuery('#extra_fields').hide();
+		jQuery('#extra-fields').html('');
 		switch(tab_name) {
-			case 'text' :
-				set_menu('text');
-				set_title('<?php _e('Post') ?>');
-				<?php if ($selection) { ?>
-					set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p>');
-				<?php } else { ?>
-					set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
-				<?php } ?>
-				return false;
-				break;
-			case 'quote' :
-				set_menu('quote');
-				set_title('<?php _e('Quote') ?>');
-				set_editor('<blockquote><?php echo $selection; ?> <p><cite><a href="<?php echo $url; ?>"><?php echo $title; ?> </a> </cite> </p></blockquote>');
-				return false;
-				break;
 			case 'video' :
-				set_menu('video');
-				set_title('<?php _e('Caption') ?>');
-				jQuery('#extra_fields').show();
-				jQuery('body').addClass('video_split');
-				jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo attribute_escape($selection); ?>'}, function() {
-					<?php 
+				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) = split("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) = split(".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) == '' )
@@ -428,44 +390,56 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 						$content = $selection;
 					}
 					?>
-					jQuery('#embed_code').prepend('<?php echo htmlentities($content); ?>');
-
-					set_editor('<a href="<?php echo $url ?>"><?php echo $title; ?></a>.');
+					jQuery('#embed-code').prepend('<?php echo htmlentities($content); ?>');
 				});
+				jQuery('#extra-fields').show();
 				return false;
 				break;
 			case 'photo' :
-				set_menu('photo');
-				set_title('<?php _e('Post') ?>');
-				<?php if ($selection) { ?>
-					set_editor('<?php echo $selection; ?><p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
-				<?php } else { ?>
-					set_editor('<p><a href="<?php echo $url ?>"><?php echo $title; ?></a></p>');
-				<?php } ?>
-				jQuery('#extra_fields').show();
-				jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>');
-				jQuery.ajax({
-					type: "GET",
-					cache : false,
-					url: "<?php echo clean_url($_SERVER['PHP_SELF']); ?>",
-					data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
-					dataType : "script",
-					success : function() {
-						jQuery('#waiting').remove();
-					}
-				});
+				function setup_photo_actions() {
+					jQuery('.close').click(function() {
+						jQuery('#extra-fields').hide();
+						jQuery('#extra-fields').html('');
+					});
+					jQuery('.refresh').click(function() {
+						photostorage = false;
+						show('photo');
+					});
+					jQuery('#photo-add-url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
+					tb_init('#extra-fields .thickbox');
+					jQuery('#waiting').hide();
+					jQuery('#extra-fields').show();
+				}
+				jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
+				
+				if(photostorage == false) {
+					jQuery.ajax({
+						type: "GET",
+						cache : false,
+						url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
+						data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
+						dataType : "script",
+						success : function(data) {
+							eval(data);
+							photostorage = jQuery('#extra-fields').html();
+							setup_photo_actions();
+						}
+					});
+				} else {
+					jQuery('#extra-fields').html(photostorage);
+					setup_photo_actions();
+				}
 				return false;
 				break;
 		}
 	}
-
-	jQuery(document).ready(function() {
-    	jQuery('#menu li').click(function (){ 
-			tab_name = this.id.split('_');
-			tab_name = tab_name[0];
-			show(tab_name);
-		});
-		// Set default tabs
+	jQuery(document).ready(function($) {
+		//resize screen
+		window.resizeTo(720,540);
+		// set button actions
+    	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) ) { ?>
 			show('video');
 		<?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
@@ -473,64 +447,151 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 		<?php  } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
 			show('photo');
 		<?php } ?>
-	});
+		jQuery('#title').unbind();
+		jQuery('#publish, #save').click(function() { jQuery('#saving').css('display', 'inline'); });
 
+		$('#tagsdiv-post_tag, #categorydiv').children('h3, .handlediv').click(function(){
+			$(this).siblings('.inside').toggle();
+		});
+	});
 </script>
 </head>
-<body class="press-this">
-<div id="wphead">
-	<h1><span id="viewsite"><a href="<?php echo get_option('home'); ?>/"><?php _e('Visit:') ?> <?php bloginfo('name'); ?></a></span></h1>
-</div>
-
-<ul id="menu" class="ui-tabs-nav">
-	<li id="text_button" class="ui-tabs-selected"><a href="#"><?php _e('Text') ?></a></li>
- 	<li id="photo_button"><a href="#"><?php _e('Photo') ?></a></li>
-	<li id="quote_button"><a href="#"><?php _e('Quote') ?></a></li>
-	<li id="video_button"><a href="#"><?php _e('Video') ?></a></li>
-</ul>
-
+<body class="press-this wp-admin">
+<div id="wphead"></div>
 <form action="press-this.php?action=post" method="post">
-	<?php wp_nonce_field('press-this') ?>
-	<input type="hidden" name="post_type" id="post_type" value="text"/>
-	<div id="posting">
-		<h2 id="title"><label for="post_title"><?php _e('Title') ?></label></h2>
-		<div class="titlewrap">
-			<input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/>
-		</div>
+<div id="poststuff" class="metabox-holder">
+	<div id="side-info-column">
+		<div class="sleeve">
+			<h1 id="viewsite"><a href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
+
+			<?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" />
+			<input type="hidden" id="prev_status" name="prev_status" value="draft" />
+
+			<!-- This div holds the photo metadata -->
+			<div class="photolist"></div>
+
+			<div id="submitdiv" class="stuffbox">
+				<div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
+					<br/>
+				</div>
+				<h3><?php _e('Publish') ?></h3>
+				<div class="inside">
+					<p>
+						<input class="button" type="submit" name="draft" value="<?php esc_attr_e('Save Draft') ?>" id="save" />
+						<?php if ( current_user_can('publish_posts') ) { ?>
+							<input class="button-primary" type="submit" name="publish" value="<?php esc_attr_e('Publish') ?>" id="publish" />
+						<?php } else { ?>
+							<br /><br /><input class="button-primary" type="submit" name="review" value="<?php esc_attr_e('Submit for Review') ?>" id="review" />
+						<?php } ?>
+						<img src="images/wpspin_light.gif" alt="" id="saving" style="display:none;" />
+					</p>
+				</div>
+			</div>
 
-		<div id="extra_fields" style="display: none"></div>
+			<div id="categorydiv" class="stuffbox">
+				<div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
+					<br/>
+				</div>
+				<h3><?php _e('Categories') ?></h3>
+				<div class="inside">
+
+					<div id="categories-all" class="tabs-panel">
+
+						<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+							<?php wp_category_checklist($post_ID, false) ?>
+						</ul>
+					</div>
+
+					<div id="category-adder" class="wp-hidden-children">
+						<a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a>
+						<p id="category-add" class="wp-hidden-child">
+							<label class="screen-reader-text" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
+							<label class="screen-reader-text" 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 esc_attr_e( 'Add' ); ?>" tabindex="3" />
+							<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
+							<span id="category-ajax-response"></span>
+						</p>
+					</div>
+				</div>
+			</div>
 
-		<div class="editor_area">
-			<h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
-			<div class="editor-container">
-				<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</textarea>
+			<div id="tagsdiv-post_tag" class="stuffbox" >
+				<div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
+					<br/>
+				</div>
+				<h3><span><?php _e('Post Tags'); ?></span></h3>
+				<div class="inside">
+					<div class="tagsdiv" id="post_tag">
+						<p class="jaxtag">
+							<label class="screen-reader-text" for="newtag"><?php _e('Post 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'); ?>" tabindex="3" />
+							</div>
+						</p>
+						<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 in Post Tags'); ?></a></p>
+				</div>
 			</div>
 		</div>
 	</div>
+	<div class="posting">
+		<?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
+		<div id="message" class="updated fade"><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></div>
+		<?php } ?>
 
-	<div id="categories">
-		<div class="submitbox" id="submitpost">
-			<div id="previewview"></div>
-			<div class="inside">
-				<h2><?php _e('Categories') ?></h2>
-				<div id="categories-all">
-					<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-						<?php wp_category_checklist() ?>
-					</ul>
-				</div>
-				
-				<h2><?php _e('Tags') ?></h2>
-				<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>
+		<div id="titlediv">
+			<div class="titlewrap">
+				<input name="title" id="title" class="text" value="<?php echo esc_attr($title);?>"/>
 			</div>
+		</div>
 
-			<p class="submit">         
-				<input type="submit" name="draft" value="<?php _e('Save') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
-				<input type="submit" name="publish" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
-				<img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
-			</p>
+		<div id="extra-fields" style="display: none"></div>
+
+		<div class="postdivrich">
+			<ul id="actions" class="actions">
+
+				<li id="photo_button">
+					Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
+<img alt="<?php _e('Insert an Image'); ?>" src="images/media-button-image.gif"/></a>
+					<?php } ?>
+				</li>
+				<li id="video_button">
+					<a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="images/media-button-video.gif"/></a>
+				</li>
+				<?php if( user_can_richedit() ) { ?>
+				<li id="switcher">
+					<?php wp_print_scripts( 'quicktags' ); ?>
+					<?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
+					<a id="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
+					<a id="edButtonPreview" class="active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
+					<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('content')" /></div>
+				</li>
+				<?php } ?>
+			</ul>
+			<div id="quicktags"></div>
+			<div class="editor-container">
+				<textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php
+					if ( $selection )
+						echo wp_richedit_pre($selection);
+					if ( $url ) {
+						echo '<p>';
+						if ( $selection )
+							_e('via ');
+						printf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
+					}
+				?></textarea>
+			</div>
 		</div>
 	</div>
+</div>
 </form>
+<?php do_action('admin_print_footer_scripts'); ?>
+<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
-</html>
\ No newline at end of file
+</html>