diff options
Diffstat (limited to 'wp-admin/press-this.php')
| -rw-r--r-- | wp-admin/press-this.php | 241 |
1 files changed, 123 insertions, 118 deletions
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 5957803..1e42def 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -1,77 +1,79 @@ <?php require_once('admin.php'); -if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin’ uh?' )); ?> - -<?php +if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin’ uh?' ) ); function preg_quote2($string) { return str_replace('/', '\/', preg_quote($string)); } +function aposfix($text) { + $translation_table[chr(34)] = '"'; + $translation_table[chr(38)] = '&'; + $translation_table[chr(39)] = '''; + return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($text, $translation_table)); +} function press_it() { // define some basic variables - $quick['post_status'] = $_REQUEST['post_status']; + $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($_REQUEST['photo_src'] as $key => $image) { - #quote for matching + + foreach( (array) $_REQUEST['photo_src'] as $key => $image) { + // escape quote for matching $quoted = preg_quote2($image); - + // see if files exist in content - we don't want to upload non-used selected files. - preg_match('/'.$quoted.'/', $_REQUEST['content'], $matches[0]); - if($matches[0]) { + if( strpos($_REQUEST['content'], $quoted) !== false ) { $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]); // Replace the POSTED content <img> with correct uploaded ones. 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; + break; } - # set the post_content - $quick['post_content'] = str_replace('<br />', "\n", preg_replace('/<\/?p>/','',$content)); + // set the post_content + $quick['post_content'] = $content; - #error handling for $post + // 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); wp_delete_post($post_ID); - } else { + } else { $quick['ID'] = $post_ID; wp_update_post($quick); } return $post_ID; } -# For submitted posts. +// 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> @@ -80,6 +82,7 @@ if ( 'post' == $_REQUEST['action'] ) { <?php add_thickbox(); wp_enqueue_style('press-this'); + wp_enqueue_style('press-this-ie'); wp_enqueue_style( 'colors' ); wp_enqueue_script('post'); @@ -89,9 +92,7 @@ if ( 'post' == $_REQUEST['action'] ) { ?> </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&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', ''); @@ -100,24 +101,20 @@ if ( 'post' == $_REQUEST['action'] ) { ?></p> </div> <?php do_action('admin_footer', ''); ?> - </body> </html> <?php die; } - -function aposfix($text) { - $translation_table[chr(34)] = '"'; - $translation_table[chr(38)] = '&'; - $translation_table[chr(39)] = '''; - return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($text, $translation_table)); -} - // Ajax Requests $title = wp_specialchars(aposfix(stripslashes($_GET['t']))); -$selection = str_replace("\n", "<br />", aposfix( stripslashes($_GET['s']) ) ); +$selection = trim( 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']; @@ -126,7 +123,7 @@ if($_REQUEST['ajax'] == 'thickbox') { ?> jQuery('.cancel').click(function() { tb_remove(); }); - + jQuery('.select').click(function() { image_selector(); }); @@ -135,10 +132,10 @@ if($_REQUEST['ajax'] == 'thickbox') { ?> <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> - + <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; } @@ -148,7 +145,7 @@ if($_REQUEST['ajax'] == 'thickbox_url') { ?> jQuery('.cancel').click(function() { tb_remove(); }); - + jQuery('.select').click(function() { image_selector(); }); @@ -157,13 +154,13 @@ if($_REQUEST['ajax'] == 'thickbox_url') { ?> <div class="titlewrap"> <input id="this_photo" name="this_photo" class="text" onkeypress="if(event.keyCode==13) image_selector();" /> </div> - - + + <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 id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p> <?php die; } @@ -178,19 +175,19 @@ if($_REQUEST['ajax'] == 'video') { ?> if($_REQUEST['ajax'] == 'photo_images') { function get_images_from_uri($uri) { - if(preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com')) + 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'; + + $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(strpos($src, 'http') === false) @@ -198,23 +195,20 @@ if($_REQUEST['ajax'] == 'photo_images') { $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src); else $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src); - + $sources[] = clean_url($src); } return "'" . implode("','", $sources) . "'"; } - + $url = urldecode($url); $url = str_replace(' ', '%20', $url); echo 'new Array('.get_images_from_uri($url).')'; -die; +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( @@ -227,7 +221,7 @@ if($_REQUEST['ajax'] == 'photo_js') { ?> dataType : "script" }).responseText ); - + for (i = 0; i < my_src.length; i++) { img = new Image(); img.src = my_src[i]; @@ -238,10 +232,10 @@ if($_REQUEST['ajax'] == 'photo_js') { ?> 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); @@ -250,19 +244,19 @@ if($_REQUEST['ajax'] == 'photo_js') { ?> } if (!skip) strtoappend += '<a href="?ajax=thickbox&i=' + img.src + '&u=<?php echo $url; ?>&height=400&width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>'; } - + function pick(img, desc) { if (img) { 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('<img src="' + img +'" alt="' + desc + '" />'); + append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" /></p>'); } tinyMCE.activeEditor.resizeToContent(); return false; } - + function image_selector() { tb_remove(); desc = jQuery('#this_photo_description').val(); @@ -270,14 +264,15 @@ if($_REQUEST['ajax'] == 'photo_js') { ?> pick(src, desc); return false; } - + jQuery(document).ready(function() { 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 die; +} if($_REQUEST['ajax'] == 'photo') { ?> <div class="photolist"></div> @@ -287,7 +282,8 @@ if($_REQUEST['ajax'] == 'photo') { ?> <div class="titlewrap"> <div id="img_container"></div> </div> -<?php die; } +<?php 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(); ?>> @@ -299,8 +295,10 @@ if($_REQUEST['ajax'] == 'photo') { ?> <?php add_thickbox(); wp_enqueue_style('press-this'); + wp_enqueue_style('press-this-ie'); wp_enqueue_style( 'colors' ); wp_enqueue_script('post'); + wp_enqueue_script('editor_functions'); do_action('admin_print_styles'); do_action('admin_print_scripts'); @@ -318,7 +316,7 @@ if($_REQUEST['ajax'] == 'photo') { ?> sl.markDone(base + '/themes/advanced/langs/' + ln + '.js'); sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js'); })(); - + tinyMCE.init({ mode: "textareas", editor_selector: "mceEditor", @@ -339,12 +337,13 @@ if($_REQUEST['ajax'] == 'photo') { ?> remove_script_host : false, convert_urls : false, apply_source_formatting : false, - remove_linebreaks : false, + remove_linebreaks : true, accessibility_focus : false, tab_focus : ":next", plugins : "safari,inlinepopups", entities : "38,amp,60,lt,62,gt", - force_p_newlines : true + force_p_newlines : true, + save_callback : 'switchEditors.saveCallback' }); <?php } ?> @@ -354,7 +353,7 @@ if($_REQUEST['ajax'] == 'photo') { ?> // 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 ) @@ -368,24 +367,23 @@ if($_REQUEST['ajax'] == 'photo') { ?> // 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 set_editor(text) { - if(tinyMCE.activeEditor) tinyMCE.activeEditor.setContent(''); - if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text); + function set_editor(text) { + if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>'; + if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, text); } - + function append_editor(text) { - if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text); + if ( '' != text && tinyMCE.activeEditor ) tinyMCE.execCommand('mceInsertContent', false, text); } - + function set_title(title) { jQuery("#content_type").text(title); } function show(tab_name) { @@ -395,39 +393,45 @@ if($_REQUEST['ajax'] == 'photo') { ?> 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><p><?php echo format_to_edit($selection); ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?> </a> </cite> </p></blockquote>"); + 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 + $content = ''; if ( preg_match("/youtube\.com\/watch/i", $url) ) { - list($domain, $video_id) = split("v=", $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>'; ?> - - <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { - - list($domain, $video_id) = split(".com/", $url); - $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 . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" /> <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>'; - - if ( trim($selection) == '' ) - $selection = '<a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a>'; - } else { + list($domain, $video_id) = split("v=", $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); + $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 . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" /> <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>'; + + if ( trim($selection) == '' ) + $selection = '<p><a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a></p>'; + + } elseif ( strpos( $selection, '<object' ) !== false ) { $content = $selection; - } ?> + } + ?> jQuery('#embed_code').prepend('<?php echo htmlentities($content); ?>'); - - set_editor("<?php echo $title; ?>"); + + set_editor('<a href="<?php echo $url ?>"><?php echo $title; ?></a>.'); }); return false; break; @@ -435,7 +439,9 @@ if($_REQUEST['ajax'] == 'photo') { ?> set_menu('photo'); set_title('<?php _e('Post') ?>'); <?php if ($selection) { ?> - set_editor("<?php echo format_to_edit($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>'); @@ -454,14 +460,13 @@ if($_REQUEST['ajax'] == 'photo') { ?> 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 <?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?> show('video'); @@ -471,7 +476,7 @@ if($_REQUEST['ajax'] == 'photo') { ?> show('photo'); <?php } ?> }); - + </script> </head> <body class="press-this"> @@ -494,39 +499,39 @@ if($_REQUEST['ajax'] == 'photo') { ?> <div class="titlewrap"> <input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/> </div> - + <div id="extra_fields" style="display: none"></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"><?php if ($selection) { ?><a href='<?php echo $url ?>'><?php echo format_to_edit($selection) ?></a><?php } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea> + <textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</textarea> </div> </div> </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 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> - <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> - <div id="post_status"> - <input type="radio" name="post_status" value="publish" checked="checked" id="published" /> <label for="published"><?php _e('Published'); ?></label> - <input type="radio" name="post_status" value="draft" id="unpublished" /> <label for="unpublished"><?php _e('Unpublished'); ?></label> + + <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> - <p class="submit"> - <input type="submit" 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> </form> </body> |