Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 8041) +++ wp-admin/includes/media.php (working copy) @@ -116,6 +116,83 @@ } +function media_sideload_image($file, $post_id) { + + if (!empty($file) ) { + // Upload File button was clicked + + $file_array['name'] = basename($file); + $file_array['tmp_name'] = download_url($file); + + $sideload = media_handle_sideload($file_array, $post_id); + + $id = $sideload['id']; + $src = $sideload['src']; + + unset($file_array['tmp_name']); + unset($file_array); + + if ( is_wp_error($id) ) { + $errors['upload_error'] = $id; + $id = false; + } + } + + if ( !empty($src) && !strpos($src, '://') ) + + $src = "http://$src"; + /*$alt = attribute_escape($_POST['insertonly']['alt']); + if ( isset($_POST['insertonly']['align']) ) { + $align = attribute_escape($_POST['insertonly']['align']); + $class = " class='align$align'"; + } */ + if ( !empty($src) ) + $html = "$alt"; + return $html; + +} + +function media_handle_sideload($file_array, $post_id, $post_data = array()) { + $overrides = array('test_form'=>false); + $file = wp_handle_sideload($file_array, $overrides); + + if ( isset($file['error']) ) + return new wp_error( 'upload_error', $file['error'] ); + + $url = $file['url']; + $type = $file['type']; + $file = $file['file']; + $title = preg_replace('/\.[^.]+$/', '', basename($file)); + $content = ''; + + // use image exif/iptc data for title and caption defaults if possible + if ( $image_meta = @wp_read_image_metadata($file) ) { + if ( trim($image_meta['title']) ) + $title = $image_meta['title']; + if ( trim($image_meta['caption']) ) + $content = $image_meta['caption']; + } + + // Construct the attachment array + $attachment = array_merge( array( + 'post_mime_type' => $type, + 'guid' => $url, + 'post_parent' => $post_id, + 'post_title' => $title, + 'post_content' => $content, + ), $post_data ); + + // Save the data + $id = wp_insert_attachment($attachment, $file, $post_parent); + if ( !is_wp_error($id) ) { + wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); + } + + return array('id' => $id, 'src' => $url); + +} + + // wrap iframe content (produced by $content_func) in a doctype, html head/body etc // any additional function args will be passed to content_func function wp_iframe($content_func /* ... */) { Index: wp-admin/includes/file.php =================================================================== --- wp-admin/includes/file.php (revision 8041) +++ wp-admin/includes/file.php (working copy) @@ -184,7 +184,99 @@ return $return; } +// Pass this function an array similar to that of a $_FILES POST array. +function wp_handle_sideload( &$file, $overrides = false ) { + // The default error handler. + if (! function_exists( 'wp_handle_upload_error' ) ) { + function wp_handle_upload_error( &$file, $message ) { + return array( 'error'=>$message ); + } + } + // You may define your own function and pass the name in $overrides['upload_error_handler'] + $upload_error_handler = 'wp_handle_upload_error'; + + // $_POST['action'] must be set and its value must equal $overrides['action'] or this: + $action = 'wp_handle_sideload'; + + // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error']. + $upload_error_strings = array( false, + __( "The file exceeds the upload_max_filesize directive in php.ini." ), + __( "The file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." ), + __( "The file was only partially uploaded." ), + __( "No file was sent." ), + __( "Missing a temporary folder." ), + __( "Failed to write file to disk." )); + + // All tests are on by default. Most can be turned off by $override[{test_name}] = false; + $test_form = true; + $test_size = true; + + // If you override this, you must provide $ext and $type!!!! + $test_type = true; + $mimes = false; + + // Install user overrides. Did we mention that this voids your warranty? + if ( is_array( $overrides ) ) + extract( $overrides, EXTR_OVERWRITE ); + + // A correct form post will pass this test. + if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) ) + return $upload_error_handler( $file, __( 'Invalid form submission.' )); + + // A successful upload will pass this test. It makes no sense to override this one. + if ( $file['error'] > 0 ) + return $upload_error_handler( $file, $upload_error_strings[$file['error']] ); + + // A non-empty file will pass this test. + if ( $test_size && !(filesize($file['tmp_name']) > 0 ) ) + return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' )); + + // A properly uploaded file will pass this test. There should be no reason to override this one. + if (! @ is_file( $file['tmp_name'] ) ) + return $upload_error_handler( $file, __( 'Specified file does not exist.' )); + + // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter. + if ( $test_type ) { + $wp_filetype = wp_check_filetype( $file['name'], $mimes ); + + extract( $wp_filetype ); + + if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) ) + return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' )); + + if ( !$ext ) + $ext = ltrim(strrchr($file['name'], '.'), '.'); + + if ( !$type ) + $type = $file['type']; + } + + // A writable uploads dir will pass this test. Again, there's no point overriding this one. + if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) + return $upload_error_handler( $file, $uploads['error'] ); + + $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); + + // Move the file to the uploads dir + $new_file = $uploads['path'] . "/$filename"; + if ( false === @ rename( $file['tmp_name'], $new_file ) ) { + return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); + } + + // Set correct file permissions + $stat = stat( dirname( $new_file )); + $perms = $stat['mode'] & 0000666; + @ chmod( $new_file, $perms ); + + // Compute the URL + $url = $uploads['url'] . "/$filename"; + + $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) ); + + return $return; +} + /** * Downloads a url to a local file using the Snoopy HTTP Class * Index: wp-admin/press-this.php =================================================================== --- wp-admin/press-this.php (revision 8041) +++ wp-admin/press-this.php (working copy) @@ -1,114 +1,226 @@ -if ( 'post' == $_REQUEST['action'] ) { - check_admin_referer('press-this'); - $post_ID = press_it(); ?> - '; + + $content .= media_sideload_image($_REQUEST['photo_src'], $post_ID); - case 'photo': - -// http_post_data(); - - if ($_REQUEST['photo_link']) - $content = ''; + if ($_REQUEST['photo_link']) + $content .= ''; - $content .= ''; + if ($_REQUEST['content']) + $content .= $content . "\n\n".$_REQUEST['content']; - if ($_REQUEST['photo_link']) - $content .= ' - '; + break; + case "video": + if($_REQUEST['embed_code']) + $content .= $_REQUEST['embed_code']."\n\n"; + $content .= $_REQUEST['content']; + break; + } - if ($_REQUEST['content']) - $content = $content . "\n".$_REQUEST['content']; + $quick['post_content'] = $content; - break; - case "video": - $content = $_REQUEST['content']; - - break; + if ( is_wp_error($post_ID) ) { + wp_die($id); + wp_delete_post($post_ID); + } else { + $quick['ID'] = $post_ID; + wp_update_post($quick); } + return $post_ID; +} - $quick['post_content'] = $content; + function tag_div() { ?> +

+
+ +
+
+

+
+
+
    + +
+
+
+

+ + +

+
+ + + -

-
- -
-
-

-
-
-
    - -
-
-
-

- - -

-
- +

+
+ +
+]+src=[\'"]([^\'" >]+?)[\'" >]/is'; + preg_match_all($pattern, $content, $matches); + if ( empty($matches[1]) ) return ''; + + $sources = array(); - $pattern = '/]+src=[\'"]([^\'" >]+?)[\'" >]/is'; - preg_match_all($pattern, $content, $matches); - if ( empty($matches[1]) ) return ''; - - $sources = array(); - foreach ($matches[1] as $src) { - if ( false !== strpos($src, '&') ) - continue; - if ( !strstr( $src, 'http://' ) ) - $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src); + foreach ($matches[1] as $src) { + if ( false !== strpos($src, '&') ) continue; + if(strpos($src, 'http') === false) { + if(strpos($src, '../') === false && strpos($src, './') === false) { + $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src); + } else { + $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src); + } + } + $sources[] = $src; + } + return "'" . implode("','", $sources) . "'"; + } - $sources[] = $src; - } - return "'" . implode("','", $sources) . "'"; + echo 'new Array('.get_images_from_uri($url).')'; +die; } +if($_REQUEST['ajax'] == 'photo_js') { ?> + + var last = null + function pick(img) { + + if (last) last.style.backgroundColor = '#f4f4f4'; + if (img) { + jQuery('#photo_src').val(img.src); + img.style.backgroundColor = '#44f'; + } + last = img; + + /*noel's code to select more than one image.... + jQuery('.photolist').append('

' + + '
' + + 'remove ' + + '
');*/ + + return false; + } + + jQuery('.remove').click(function() { + jQuery(this).remove; + }); + + + var my_src, img, img_tag, aspect, w, h, skip, i, strtoappend = ""; + + var my_src =eval( + jQuery.ajax({ + type: "GET", + url: "", + cache : false, + async : false, + data: "ajax=photo_images&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 + '" onclick="pick(this);"'; + skip = false; + + if (img.width && img.height) { + if (img.width * img.height < 2500) skip = true; + aspect = img.width / img.height; + if (aspect > 1) { // Image is wide + scale = 75 / img.width; + } else { // Image is tall or square + scale = 75 / img.height; + } + if (scale < 1) { + w = parseInt(img.width * scale); + h = parseInt(img.height * scale); + } else { + w = img.width; + h = img.height; + } + img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; + } + + if (!skip) strtoappend += ''; + + } + + jQuery('#img_container').html(strtoappend); + + tb_init('a.thickbox, area.thickbox, input.thickbox'); //pass where to apply thickbox + + +

+
+ +
+ +
+ +

+
+ +
+ + +
+
Loading Images...
+
+ - jQuery('#tags-input').hide(); + jQuery('#tags-input').hide(); - tag_update_quickclicks(); + tag_update_quickclicks(); - // add the quickadd form - jQuery('#jaxtag').prepend(''+postL10n.separate+''); + // add the quickadd form + jQuery('#jaxtag').prepend(''+postL10n.separate+''); - 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' ); - }); + 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 ); + // 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'); @@ -202,129 +314,113 @@ jQuery("#post_type").val(type); } function set_editor(text) { - tinyMCE.activeEditor.setContent(''); - tinyMCE.execCommand('mceInsertContent' ,false, text); + if(tinyMCE.activeEditor) tinyMCE.activeEditor.setContent(''); + if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text); } function set_title(title) { jQuery("#content_type").text(title); } - - var last = null; - function pick(img) { - if (last) last.style.backgroundColor = '#f4f4f4'; - if (img) { - document.getElementById('photo_src').value = img.src; - img.style.backgroundColor = '#44f'; - } - last = img; - - /*noel's code to select more than one image.... - jQuery('.photolist').append('

' + - '
' + - 'remove ' + - '
');*/ - - return false; + function reset_height() { + tinyMCE.height = '170px'; } + function show(tab_name) { + jQuery('body').removeClass('video_split'); + jQuery('#extra_fields').hide(); + switch(tab_name) { + case 'text' : + reset_height(); + jQuery('.editor-container').show(); + jQuery('#content_type').show(); + set_menu('text'); + set_title(''); + set_editor(''); + return false; + break; + case 'quote' : + reset_height(); + jQuery('.editor-container').show(); + jQuery('#content_type').show(); + set_menu('quote'); + set_title(''); + set_editor('

'); - jQuery(document).ready(function() { - - - - - + return false; + break; + case 'video' : + reset_height(); + jQuery('.editor-container').show(); + jQuery('#content_type').show(); + set_menu('video'); + set_title(''); + + jQuery('#extra_fields').show(); + jQuery('body').addClass('video_split'); - + + jQuery('#extra_fields').load('', { ajax: 'video', selection: ''}, function() { + + '; ?> + + '; + + if(trim($selection) == '') $selection = '' . $title . ' on Vimeo'; + }else { + $content = $selection; + } ?> + jQuery('#embed_code').prepend(''); + set_editor(''); + + }); - - - - jQuery("#text_button").click(function () { - jQuery('.editor-container').show(); - jQuery('#content_type').show(); - jQuery('#photo_fields').hide(); - set_menu('text'); - set_title(''); - set_editor(''); - return false; - }); - - jQuery("#quote_button").click(function () { - jQuery('.editor-container').show(); - jQuery('#content_type').show(); - jQuery('#photo_fields').hide(); - set_menu('quote'); - set_title(''); - set_editor('

'); + + return false; + break; - return false; - }); - + case 'photo' : + reset_height(); + set_menu('photo'); + set_title('Caption'); + set_editor(''); + + jQuery('#extra_fields').show(); + jQuery('#extra_fields').load(''); + jQuery('#extra_fields').prepend('

Loading...

'); + jQuery.ajax({ + type: "GET", + cache : false, + url: "", + data: "ajax=photo_js&url=", + dataType : "script", + success : function() { + } + }); + return false; + break; - jQuery("#video_button").click(function () { - jQuery('.editor-container').show(); - jQuery('#content_type').show(); - jQuery('#photo_fields').hide(); - set_menu('video'); - set_title(''); - set_editor(''); - ';--> - */?> - return false; - }); + } - - jQuery("#photo_button").click(function () { - set_menu('photo'); - set_title('Caption'); - set_editor(''); - jQuery('#photo_fields').show(); - jQuery('.remove').click(function() { - jQuery(this).remove; - + } + + jQuery(document).ready(function() { + jQuery('#menu li').click(function (){ + tab_name = this.id.split('_'); + tab_name = tab_name[0]; + show(tab_name); }); - - var img, img_tag, aspect, w, h, skip, i, strtoappend = ""; - var my_src = []; - - for (i = 0; i < my_src.length; i++) { - img = new Image(); - img.src = my_src[i]; - img_attr = 'id="img' + i + '" onclick="pick(this);"'; - skip = false; - - if (img.width && img.height) { - if (img.width * img.height < 2500) skip = true; - aspect = img.width / img.height; - if (aspect > 1) { // Image is wide - scale = 75 / img.width; - } else { // Image is tall or square - scale = 75 / img.height; - } - if (scale < 1) { - w = parseInt(img.width * scale); - h = parseInt(img.height * scale); - } else { - w = img.width; - h = img.height; - } - img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; - } - - if (!skip) strtoappend += ''; - - } - - jQuery('#img_container').html(strtoappend); - - tb_init('a.thickbox, area.thickbox, input.thickbox'); //pass where to apply thickbox - - }); + + show('video'); + + show('video'); + + show('photo'); + }); - - - +