WordPress 3.9-scripts

[autoinstalls/wordpress.git] / wp-admin / press-this.php

diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 8bd6ce28f71c0208ab21bf5fab5ece32db20531b..1becc48f8c803a651e745ae4a9536da4bb0fa687 100644 (file)
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -1,424 +1,388 @@
 <?php
 <?php

-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));
-}
-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 This Display and Handler.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ */
+
+define('IFRAME_REQUEST' , true);
+
+/** WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) )
+       wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+/**
+ * Press It form handler.
+ *
+ * @since 2.6.0
+ *
+ * @return int Post ID
+ */

 function press_it() {
 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'] = '';
-
-       // 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);
-                               }
-                       }
-
-                       break;

 
 

-               case "video":
-                       if($_REQUEST['embed_code']) 
-                               $content .= $_REQUEST['embed_code']."\n\n";
-                       $content .= $_REQUEST['content'];
-                       break;
+       $post = get_default_post_to_edit();
+       $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
-       $quick['post_content'] = $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 $post
-       if ( is_wp_error($post_ID)) {
-               wp_die($id);
-               wp_delete_post($post_ID);

        // error handling for media_sideload
        // error handling for media_sideload

-       } elseif ( is_wp_error($upload)) {
-               wp_die($upload);
+       if ( is_wp_error($upload) ) {

                wp_delete_post($post_ID);
                wp_delete_post($post_ID);

+               wp_die($upload);

        } else {
        } else {

-               $quick['ID'] = $post_ID;
-               wp_update_post($quick);
+               // 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.
        return $post_ID;
 }
 
 // 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');
+       $posted = $post_ID = press_it();
+} else {
+       $post = get_default_post_to_edit('post', true);
+       $post_ID = $post->ID;

 }
 
 }
 

-// Ajax Requests
-$title = wp_specialchars(aposfix(stripslashes($_GET['t'])));
+// Set Variables
+$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( wp_unslash( $_GET['t'] ) , ENT_QUOTES) ) ) : '';
+
+$selection = '';
+if ( !empty($_GET['s']) ) {
+       $selection = str_replace('&apos;', "'", wp_unslash($_GET['s']));
+       $selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) );
+}

 
 

-$selection = trim( aposfix( stripslashes($_GET['s']) ) );

 if ( ! empty($selection) ) {
        $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
 if ( ! empty($selection) ) {
        $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);

-       $selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
+       $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();
-               });
-
-               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>
-
-       <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>
+$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">
+                       /* <![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;

 
 

-       <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; 
-}
+               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" type="text" onkeypress="if(event.keyCode==13) image_selector(this);" value="<?php echo esc_attr($title);?>"/>
+                               </div>
+                       </div>

 
 

-if($_REQUEST['ajax'] == 'thickbox_url') { ?>
-       <script type="text/javascript" charset="utf-8">
-               jQuery('.cancel').click(function() {
-                       tb_remove();
-               });
+                       <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>

 
 

-               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>
+                       <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.
+                *
+                * @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>';

 
 

-       <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>
+                       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);

 
 

-       <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
-<?php die; 
-}
+                                       w = img.width;
+                                       h = 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;
-}
+                                       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;
+                       }
+               }

 
 

-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);
+               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;

                }
                }

-               return "'" . implode("','", $sources) . "'";
-       } 

 
 

-       $url = urldecode($url);
-       $url = str_replace(' ', '%20', $url);
-       echo 'new Array('.get_images_from_uri($url).')'; 
-die;
-}
+               function image_selector(el) {
+                       var desc, src, parent = jQuery(el).closest('#photo-add-url-div');

 
 

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

                        }
                        }

-                       img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
-               }
-               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>');
+                       tb_remove();
+                       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('#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 button-small"><?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);
                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;
+               <?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(); ?>>
-<head>
-       <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( 'colors' );
        wp_enqueue_style( 'colors' );

-       wp_enqueue_script('post');
-       wp_enqueue_script('editor_functions');
+       wp_enqueue_script( 'post' );
+       add_thickbox();
+       _wp_admin_html_begin();
+?>
+<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 ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'press-this', isRtl = <?php echo (int) is_rtl(); ?>;
+var photostorage = false;
+//]]>
+</script>

 
 

-       do_action('admin_print_styles');
-       do_action('admin_print_scripts');
-       do_action('admin_head');
+<?php
+       /** This action is documented in wp-admin/admin-header.php */
+       do_action( 'admin_enqueue_scripts', 'press-this.php' );
+
+       /**
+        * Fires when styles are printed for the Press This admin page.
+        *
+        * @since 3.7.0
+        */
+       do_action( 'admin_print_styles-press-this.php' );
+
+       /** This action is documented in wp-admin/admin-header.php */
+       do_action( 'admin_print_styles' );
+
+       /**
+        * Fires when scripts are printed for the Press This admin page.
+        *
+        * @since 3.7.0
+        */
+       do_action( 'admin_print_scripts-press-this.php' );
+
+       /** This action is documented in wp-admin/admin-header.php */
+       do_action( 'admin_print_scripts' );
+
+       /**
+        * Fires in the head tag on the Press This admin page.
+        *
+        * @since 3.7.0
+        */
+       do_action( 'admin_head-press-this.php' );
+
+       /** This action is documented in wp-admin/admin-header.php */
+       do_action( 'admin_head' );

 ?>
        <script type="text/javascript">
 ?>
        <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 );
+       var wpActiveEditor = 'content';

 
 

-       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) {
+               if ( typeof(QTags) != 'undefined' )
+                       QTags.insertContent(text);

        }
        }

-

        function set_editor(text) {
        function set_editor(text) {

-               if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
-               if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, 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) {
        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>');
+               } else {
+                       insert_plain_editor(text);
+               }

        }
 
        }
 

-       function set_title(title) { jQuery("#content_type").text(title); }
-

        function show(tab_name) {
        function show(tab_name) {

-               jQuery('body').removeClass('video_split');
-               jQuery('#extra_fields').hide();
+               jQuery('#extra-fields').html('');

                switch(tab_name) {
                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' :
                        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) ) {
                                        $content = '';
                                        if ( preg_match("/youtube\.com\/watch/i", $url) ) {

-                                               list($domain, $video_id) = split("v=", $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) ) {
                                                $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);
+                                               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) == '' )
                                                $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,109 +392,289 @@ if($_REQUEST['ajax'] == 'photo') { ?>
                                                $content = $selection;
                                        }
                                        ?>
                                                $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' :
                                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').click(function(){
+                                               var form = jQuery('#photo-add-url-div').clone();
+                                               jQuery('#img_container').empty().append( form.show() );
+                                       });
+                                       jQuery('#waiting').hide();
+                                       jQuery('#extra-fields').show();
+                               }
+
+                               jQuery('#waiting').show();
+                               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;
                }
        }
                                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(760,580);
+               // 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) ) { ?>
                        show('video');
                <?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
                        show('video');
                <?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 } ?>
                        show('photo');
                <?php } ?>

-       });
+               jQuery('#title').unbind();
+               jQuery('#publish, #save').click(function() { jQuery('.press-this #publishing-actions .spinner').css('display', 'inline-block'); });

 
 

+               $('#tagsdiv-post_tag, #categorydiv').children('h3, .handlediv').click(function(){
+                       $(this).siblings('.inside').toggle();
+               });
+       });

 </script>
 </head>
 </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>
+<?php
+$admin_body_class = ( is_rtl() ) ? 'rtl' : '';
+$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+?>
+<body class="press-this wp-admin wp-core-ui <?php echo $admin_body_class; ?>">
+<form action="press-this.php?action=post" method="post">
+<div id="poststuff" class="metabox-holder">
+       <div id="side-sortables" class="press-this-sidebar">
+               <div class="sleeve">
+                       <?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" />
+                       <input type="hidden" id="post_id" name="post_id" value="<?php echo (int) $post_ID; ?>" />
+
+                       <!-- This div holds the photo metadata -->
+                       <div class="photolist"></div>
+
+                       <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>
+                               <div class="inside">
+                                       <p id="publishing-actions">
+                                       <?php
+                                               submit_button( __( 'Save Draft' ), 'button', 'draft', false, array( 'id' => 'save' ) );
+                                               if ( current_user_can('publish_posts') ) {
+                                                       submit_button( __( 'Publish' ), 'primary', 'publish', false );
+                                               } else {
+                                                       echo '<br /><br />';
+                                                       submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
+                                               } ?>
+                                               <span class="spinner" style="display: none;"></span>
+                                       </p>
+                                       <?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
+                                                       $post_formats = get_theme_support( 'post-formats' );
+                                                       if ( is_array( $post_formats[0] ) ) :
+                                                               $default_format = get_option( 'default_post_format', '0' );
+                                               ?>
+                                       <p>
+                                               <label for="post_format"><?php _e( 'Post Format:' ); ?>
+                                               <select name="post_format" id="post_format">
+                                                       <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+                                               <?php foreach ( $post_formats[0] as $format ): ?>
+                                                       <option<?php selected( $default_format, $format ); ?> value="<?php echo esc_attr( $format ); ?>"> <?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+                                               <?php endforeach; ?>
+                                               </select></label>
+                                       </p>
+                                       <?php endif; endif; ?>
+                               </div>
+                       </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>
+                       <?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>
+                               <div class="inside">
+                               <div id="taxonomy-category" class="categorydiv">

 
 

-<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>
+                                       <ul id="category-tabs" class="category-tabs">
+                                               <li class="tabs"><a href="#category-all"><?php echo $tax->labels->all_items; ?></a></li>
+                                               <li class="hide-if-no-js"><a href="#category-pop"><?php _e( 'Most Used' ); ?></a></li>
+                                       </ul>

 
 

-               <div id="extra_fields" style="display: none"></div>
+                                       <div id="category-pop" class="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="category-all" class="tabs-panel">
+                                               <ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
+                                                       <?php wp_terms_checklist($post_ID, array( 'taxonomy' => 'category', 'popular_cats' => $popular_ids ) ) ?>
+                                               </ul>
+                                       </div>
+
+                                       <?php if ( !current_user_can($tax->cap->assign_terms) ) : ?>
+                                       <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">
+                                                       <h4>
+                                                               <a id="category-add-toggle" href="#category-add" class="hide-if-no-js">
+                                                                       <?php printf( __( '+ %s' ), $tax->labels->add_new_item ); ?>
+                                                               </a>
+                                                       </h4>
+                                                       <p id="category-add" class="category-add wp-hidden-child">
+                                                               <label class="screen-reader-text" for="newcategory"><?php echo $tax->labels->add_new_item; ?></label>
+                                                               <input type="text" name="newcategory" id="newcategory" class="form-required form-input-tip" value="<?php echo esc_attr( $tax->labels->new_item_name ); ?>" aria-required="true"/>
+                                                               <label class="screen-reader-text" for="newcategory_parent">
+                                                                       <?php echo $tax->labels->parent_item_colon; ?>
+                                                               </label>
+                                                               <?php wp_dropdown_categories( array( 'taxonomy' => 'category', 'hide_empty' => 0, 'name' => 'newcategory_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; ' . $tax->labels->parent_item . ' &mdash;' ) ); ?>
+                                                               <input type="button" id="category-add-submit" data-wp-lists="add:categorychecklist:category-add" class="button category-add-submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" />
+                                                               <?php wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false ); ?>
+                                                               <span id="category-ajax-response"></span>
+                                                       </p>
+                                               </div>
+                                       <?php endif; ?>
+                               </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="postbox">
+                               <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
+                               <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>
+                                                       <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'); ?>" />
+                                                       </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>
+                               </div>

                        </div>
                </div>
        </div>
                        </div>
                </div>
        </div>

+       <div class="posting">
+
+               <div id="wphead">
+                       <h1 id="site-heading">
+                               <a href="<?php echo get_option('home'); ?>/" target="_blank">
+                                       <span id="site-title"><?php bloginfo('name'); ?></span>
+                               </a>
+                       </h1>
+               </div>

 
 

-       <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>
+               <?php
+               if ( isset($posted) && intval($posted) ) {
+                       $post_ID = intval($posted); ?>
+                       <div id="message" class="updated">
+                       <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>
                        </div>

+               <?php } ?>

 
 

-                       <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="titlediv">
+                       <div class="titlewrap">
+                               <input name="title" id="title" class="text" type="text" value="<?php echo esc_attr($title);?>"/>
+                       </div>
+               </div>
+
+               <div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading&hellip;' ); ?></span></div>
+
+               <div id="extra-fields" style="display: none"></div>
+
+               <div class="postdivrich">
+               <?php
+
+               $editor_settings = array(
+                       'teeny' => true,
+                       'textarea_rows' => '15'
+               );
+
+               $content = '';
+               if ( $selection )
+                       $content .= $selection;
+
+               if ( $url ) {
+                       $content .= '<p>';
+
+                       if ( $selection )
+                               $content .= __('via ');
+
+                       $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 );
+
+               ?>

                </div>
        </div>
                </div>
        </div>

+</div>

 </form>
 </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
+/** This action is documented in wp-admin/admin-footer.php */
+do_action( 'admin_footer' );
+/** This action is documented in wp-admin/admin-footer.php */
+do_action( 'admin_print_footer_scripts' );
+?>
+<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>

 </body>
 </body>

-</html>
\ No newline at end of file
+</html>