X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..b137f4ce021b4022c56f452c2eafa7abfcef0a7c:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 1bfe3e27..99deac5a 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -9,7 +9,7 @@ /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -27,7 +27,7 @@ function media_upload_tabs() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $tabs * @return unknown @@ -59,7 +59,7 @@ add_filter('media_upload_tabs', 'update_gallery_tab'); /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 */ function the_media_upload_tabs() { global $redir_tab; @@ -89,7 +89,7 @@ function the_media_upload_tabs() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $id * @param unknown_type $alt @@ -117,7 +117,7 @@ function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.6.0 * * @param unknown_type $html * @param unknown_type $id @@ -140,6 +140,11 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $ $width = $matches[1]; + $caption = str_replace( array( '>', '<', '"', "'" ), + array( '>', '<', '"', ''' ), + $caption + ); + $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html ); if ( empty($align) ) $align = 'none'; @@ -154,7 +159,7 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $html */ @@ -175,15 +180,15 @@ win.send_to_editor(''); * * This handles the file upload POST itself, creating the attachment post. * - * @since unknown + * @since 2.5.0 * - * @param unknown_type $file_id - * @param unknown_type $post_id - * @param unknown_type $post_data - * @return unknown + * @param string $file_id Index into the {@link $_FILES} array of the upload + * @param int $post_id The post ID the media is associated with + * @param array $post_data allows you to overwrite some of the attachment + * @param array $overrides allows you to override the {@link wp_handle_upload()} behavior + * @return int the ID of the attachment */ -function media_handle_upload($file_id, $post_id, $post_data = array()) { - $overrides = array('test_form'=>false); +function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) { $time = current_time('mysql'); if ( $post = get_post($post_id) ) { @@ -208,9 +213,9 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { // 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']) ) + if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) $title = $image_meta['title']; - if ( trim($image_meta['caption']) ) + if ( trim( $image_meta['caption'] ) ) $content = $image_meta['caption']; } @@ -223,6 +228,10 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { 'post_content' => $content, ), $post_data ); + // This should never be set as it would then overwrite an existing attachment. + if ( isset( $attachment['ID'] ) ) + unset( $attachment['ID'] ); + // Save the data $id = wp_insert_attachment($attachment, $file, $post_id); if ( !is_wp_error($id) ) { @@ -234,15 +243,15 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { } /** - * {@internal Missing Short Description}} + * This handles a sideloaded file in the same way as an uploaded file is handled by {@link media_handle_upload()} * - * @since unknown + * @since 2.6.0 * - * @param unknown_type $file_array - * @param unknown_type $post_id - * @param unknown_type $desc - * @param unknown_type $post_data - * @return unknown + * @param array $file_array Array similar to a {@link $_FILES} upload array + * @param int $post_id The post ID the media is associated with + * @param string $desc Description of the sideloaded file + * @param array $post_data allows you to overwrite some of the attachment + * @return int|object The ID of the attachment or a WP_Error on failure */ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) { $overrides = array('test_form'=>false); @@ -259,13 +268,13 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = // 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']) ) + if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) $title = $image_meta['title']; - if ( trim($image_meta['caption']) ) + if ( trim( $image_meta['caption'] ) ) $content = $image_meta['caption']; } - $title = @$desc; + $title = isset($desc) ? $desc : ''; // Construct the attachment array $attachment = array_merge( array( @@ -276,12 +285,15 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = 'post_content' => $content, ), $post_data ); + // This should never be set as it would then overwrite an existing attachment. + if ( isset( $attachment['ID'] ) ) + unset( $attachment['ID'] ); + // Save the attachment metadata $id = wp_insert_attachment($attachment, $file, $post_id); - if ( !is_wp_error($id) ) { + if ( !is_wp_error($id) ) wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); - return $url; - } + return $id; } @@ -291,7 +303,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = * Wrap iframe content (produced by $content_func) in a doctype, html head/body * etc any additional function args will be passed to content_func. * - * @since unknown + * @since 2.5.0 * * @param unknown_type $content_func */ @@ -306,7 +318,9 @@ function wp_iframe($content_func /* ... */) { wp_enqueue_style( 'global' ); wp_enqueue_style( 'wp-admin' ); wp_enqueue_style( 'colors' ); -if ( 0 === strpos( $content_func, 'media' ) ) +// Check callback name for 'media' +if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) + || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) wp_enqueue_style( 'media' ); wp_enqueue_style( 'ie' ); ?> @@ -314,7 +328,8 @@ wp_enqueue_style( 'ie' ); //','uid':'ID; ?>','time':''}; -var ajaxurl = '', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup'; +var ajaxurl = '', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup', +isRtl = ; //]]> $image_title - $video_title - $audio_title - $media_title - -EOF; + printf($context, $out); } add_action( 'media_buttons', 'media_buttons' ); +function _media_button($title, $icon, $type) { + return "$title"; +} + +function get_upload_iframe_src($type) { + global $post_ID, $temp_ID; + $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); + $upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php'); + + if ( 'media' != $type ) + $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src); + $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src); + + return add_query_arg('TB_iframe', true, $upload_iframe_src); +} + /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -392,6 +427,11 @@ function media_upload_form_handler() { if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) { $post = $_post = get_post($attachment_id, ARRAY_A); + $post_type_object = get_post_type_object( $post[ 'post_type' ] ); + + if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) ) + continue; + if ( isset($attachment['post_content']) ) $post['post_content'] = $attachment['post_content']; if ( isset($attachment['post_title']) ) @@ -408,7 +448,7 @@ function media_upload_form_handler() { $post = apply_filters('attachment_fields_to_save', $post, $attachment); - if ( isset($attachment['image_alt']) && !empty($attachment['image_alt']) ) { + if ( isset($attachment['image_alt']) ) { $image_alt = get_post_meta($attachment_id, '_wp_attachment_image_alt', true); if ( $image_alt != stripslashes($attachment['image_alt']) ) { $image_alt = wp_strip_all_tags( stripslashes($attachment['image_alt']), true ); @@ -447,8 +487,9 @@ function media_upload_form_handler() { $html = $attachment['post_title']; if ( !empty($attachment['url']) ) { - if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) ) - $rel = " rel='attachment wp-att-" . esc_attr($send_id)."'"; + $rel = ''; + if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] ) + $rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'"; $html = "$html"; } @@ -462,7 +503,7 @@ function media_upload_form_handler() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -471,6 +512,7 @@ function media_upload_image() { $id = 0; if ( isset($_POST['html-upload']) && !empty($_FILES) ) { + check_admin_referer('media-form'); // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); unset($_FILES); @@ -519,19 +561,19 @@ function media_upload_image() { } /** - * {@internal Missing Short Description}} + * Download an image from the specified URL and attach it to a post. * - * @since unknown + * @since 2.6.0 * - * @param unknown_type $file - * @param unknown_type $post_id - * @param unknown_type $desc - * @return unknown + * @param string $file The URL of the image to download + * @param int $post_id The post ID the media is to be associated with + * @param string $desc Optional. Description of the image + * @return string|WP_Error Populated HTML img tag on success */ function media_sideload_image($file, $post_id, $desc = null) { - if (!empty($file) ) { + if ( ! empty($file) ) { // Download file to temp location - $tmp = download_url($file); + $tmp = download_url( $file ); // Set variables for storage // fix file filename for query strings @@ -540,25 +582,25 @@ function media_sideload_image($file, $post_id, $desc = null) { $file_array['tmp_name'] = $tmp; // If error storing temporarily, unlink - if ( is_wp_error($tmp) ) { + if ( is_wp_error( $tmp ) ) { @unlink($file_array['tmp_name']); $file_array['tmp_name'] = ''; } // do the validation and storage stuff - $id = media_handle_sideload($file_array, $post_id, @$desc); - $src = $id; - + $id = media_handle_sideload( $file_array, $post_id, $desc ); // If error storing permanently, unlink if ( is_wp_error($id) ) { @unlink($file_array['tmp_name']); return $id; } + + $src = wp_get_attachment_url( $id ); } // Finally check to make sure the file has been saved, then return the html - if ( !empty($src) ) { - $alt = @$desc; + if ( ! empty($src) ) { + $alt = isset($desc) ? esc_attr($desc) : ''; $html = "$alt"; return $html; } @@ -567,7 +609,7 @@ function media_sideload_image($file, $post_id, $desc = null) { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -576,6 +618,7 @@ function media_upload_audio() { $id = 0; if ( isset($_POST['html-upload']) && !empty($_FILES) ) { + check_admin_referer('media-form'); // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); unset($_FILES); @@ -625,7 +668,7 @@ function media_upload_audio() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -634,6 +677,7 @@ function media_upload_video() { $id = 0; if ( isset($_POST['html-upload']) && !empty($_FILES) ) { + check_admin_referer('media-form'); // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); unset($_FILES); @@ -683,7 +727,7 @@ function media_upload_video() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -692,6 +736,7 @@ function media_upload_file() { $id = 0; if ( isset($_POST['html-upload']) && !empty($_FILES) ) { + check_admin_referer('media-form'); // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); unset($_FILES); @@ -738,7 +783,7 @@ function media_upload_file() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -761,7 +806,7 @@ function media_upload_gallery() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @return unknown */ @@ -782,7 +827,7 @@ function media_upload_library() { /** * Retrieve HTML for the image alignment radio buttons with the specified one checked. * - * @since unknown + * @since 2.7.0 * * @param unknown_type $post * @param unknown_type $checked @@ -810,16 +855,16 @@ function image_align_input_fields( $post, $checked = '' ) { /** * Retrieve HTML for the size radio buttons with the specified one checked. * - * @since unknown + * @since 2.7.0 * * @param unknown_type $post - * @param unknown_type $checked + * @param unknown_type $check * @return unknown */ function image_size_input_fields( $post, $check = '' ) { // get a list of the actual pixel dimensions of each possible intermediate version of this image - $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size')); + $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')); if ( empty($check) ) $check = get_user_setting('imgsize', 'medium'); @@ -843,12 +888,12 @@ function image_size_input_fields( $post, $check = '' ) { $checked = " checked='checked'"; } - $html = "
"; + $html = "
"; $html .= ""; // only show the dimensions if that choice is available if ( $enabled ) - $html .= " "; + $html .= " "; $html .= '
'; @@ -865,7 +910,7 @@ function image_size_input_fields( $post, $check = '' ) { /** * Retrieve HTML for the Link URL buttons with the default link type as specified. * - * @since unknown + * @since 2.7.0 * * @param unknown_type $post * @param unknown_type $url_type @@ -896,7 +941,7 @@ function image_link_input_fields($post, $url_type = '') { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $form_fields * @param unknown_type $post @@ -912,7 +957,7 @@ function image_attachment_fields_to_edit($form_fields, $post) { $form_fields['image_alt'] = array( 'value' => $alt, - 'label' => __('Alternate text'), + 'label' => __('Alternate Text'), 'helps' => __('Alt text for the image, e.g. “The Mona Lisa”') ); @@ -935,7 +980,7 @@ add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2 /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $form_fields * @param unknown_type $post @@ -946,6 +991,15 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) { return $form_fields; } +/** + * {@internal Missing Short Description}} + * + * @since 2.8.0 + * + * @param unknown_type $form_fields + * @param unknown_type $post + * @return unknown + */ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['image_url']); return $form_fields; @@ -954,7 +1008,7 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $post * @param unknown_type $attachment @@ -976,7 +1030,7 @@ add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $html * @param unknown_type $attachment_id @@ -1003,7 +1057,7 @@ add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3); /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $post * @param unknown_type $errors @@ -1019,6 +1073,8 @@ function get_attachment_fields_to_edit($post, $errors = null) { $edit_post = sanitize_post($post, 'edit'); + + $form_fields = array( 'post_title' => array( 'label' => __('Title'), @@ -1055,6 +1111,8 @@ function get_attachment_fields_to_edit($post, $errors = null) { foreach ( get_attachment_taxonomies($post) as $taxonomy ) { $t = (array) get_taxonomy($taxonomy); + if ( ! $t['public'] ) + continue; if ( empty($t['label']) ) $t['label'] = $taxonomy; if ( empty($t['args']) ) @@ -1089,13 +1147,14 @@ function get_attachment_fields_to_edit($post, $errors = null) { * component. Will also create link for showing and hiding the form to modify * the image attachment. * - * @since unknown + * @since 2.5.0 * * @param int $post_id Optional. Post ID. * @param array $errors Errors for attachment, if any. * @return string */ function get_media_items( $post_id, $errors ) { + $attachments = array(); if ( $post_id ) { $post = get_post($post_id); if ( $post && $post->post_type == 'attachment' ) @@ -1122,7 +1181,7 @@ function get_media_items( $post_id, $errors ) { /** * Retrieve HTML form for modifying the image attachment. * - * @since unknown + * @since 2.5.0 * * @param int $attachment_id Attachment ID for modification. * @param string|array $args Optional. Override defaults. @@ -1131,38 +1190,39 @@ function get_media_items( $post_id, $errors ) { function get_media_item( $attachment_id, $args = null ) { global $redir_tab; - if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) ) + if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) ) $thumb_url = $thumb_url[0]; else - return false; + $thumb_url = false; - $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true ); + $post = get_post( $attachment_id ); + + $default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true ); $args = wp_parse_args( $args, $default_args ); + $args = apply_filters( 'get_media_item_args', $args ); extract( $args, EXTR_SKIP ); - $toggle_on = __('Show'); - $toggle_off = __('Hide'); - - $post = get_post($attachment_id); + $toggle_on = __( 'Show' ); + $toggle_off = __( 'Hide' ); - $filename = basename($post->guid); - $title = esc_attr($post->post_title); + $filename = esc_html( basename( $post->guid ) ); + $title = esc_attr( $post->post_title ); - if ( $_tags = get_the_tags($attachment_id) ) { + if ( $_tags = get_the_tags( $attachment_id ) ) { foreach ( $_tags as $tag ) $tags[] = $tag->name; - $tags = esc_attr(join(', ', $tags)); + $tags = esc_attr( join( ', ', $tags ) ); } $post_mime_types = get_post_mime_types(); - $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type)); - $type = array_shift($keys); + $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) ); + $type = array_shift( $keys ); $type_html = ""; - $form_fields = get_attachment_fields_to_edit($post, $errors); + $form_fields = get_attachment_fields_to_edit( $post, $errors ); if ( $toggle ) { - $class = empty($errors) ? 'startclosed' : 'startopen'; + $class = empty( $errors ) ? 'startclosed' : 'startopen'; $toggle_links = " $toggle_on $toggle_off"; @@ -1172,35 +1232,37 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case - $display_title = $show_title ? "
" . wp_html_excerpt($display_title, 60) . "
" : ''; + $display_title = $show_title ? "
" . wp_html_excerpt( $display_title, 60 ) . "
" : ''; - $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false; + $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) ); $order = ''; foreach ( $form_fields as $key => $val ) { if ( 'menu_order' == $key ) { if ( $gallery ) - $order = '
'; + $order = "
"; else - $order = ''; + $order = ""; - unset($form_fields['menu_order']); + unset( $form_fields['menu_order'] ); break; } } $media_dims = ''; - $meta = wp_get_attachment_metadata($post->ID); - if ( is_array($meta) && array_key_exists('width', $meta) && array_key_exists('height', $meta) ) - $media_dims .= "{$meta['width']} × {$meta['height']} "; - $media_dims = apply_filters('media_meta', $media_dims, $post); + $meta = wp_get_attachment_metadata( $post->ID ); + if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) ) + $media_dims .= "{$meta['width']} × {$meta['height']} "; + $media_dims = apply_filters( 'media_meta', $media_dims, $post ); $image_edit_button = ''; - if ( gd_edit_image_support($post->post_mime_type) ) { - $nonce = wp_create_nonce("image_editor-$post->ID"); - $image_edit_button = " "; + if ( gd_edit_image_support( $post->post_mime_type ) ) { + $nonce = wp_create_nonce( "image_editor-$post->ID" ); + $image_edit_button = " "; } + $attachment_url = get_permalink( $attachment_id ); + $item = " $type_html $toggle_links @@ -1208,18 +1270,23 @@ function get_media_item( $attachment_id, $args = null ) { $display_title - - - - - - \n"; + + + \n"; + - if ( !empty($media_dims) ) - $item .= "\n"; $item .= " - @@ -1233,14 +1300,19 @@ function get_media_item( $attachment_id, $args = null ) { ); if ( $send ) - $send = ""; - if ( $delete && current_user_can('delete_post', $attachment_id) ) { + $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { if ( !EMPTY_TRASH_DAYS ) { - $delete = "" . __('Delete Permanently') . ""; + $delete = "" . __( 'Delete Permanently' ) . ''; } elseif ( !MEDIA_TRASH ) { - $delete = "" . __('Delete') . "
" . sprintf(__("You are about to delete %s."), $filename) . " " . __('Continue') . " " . __('Cancel') . "
"; + $delete = "" . __( 'Delete' ) . " + "; } else { - $delete = "" . __('Move to Trash') . "" . __('Undo') . ""; + $delete = "" . __( 'Move to Trash' ) . " + "; } } else { $delete = ''; @@ -1249,27 +1321,29 @@ function get_media_item( $attachment_id, $args = null ) { $thumbnail = ''; $calling_post_id = 0; if ( isset( $_GET['post_id'] ) ) - $calling_post_id = $_GET['post_id']; + $calling_post_id = absint( $_GET['post_id'] ); elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set $calling_post_id = $post->post_parent; - if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) - $thumbnail = "" . esc_html__( "Use as thumbnail" ) . ""; + if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) { + $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" ); + $thumbnail = "" . esc_html__( "Use as featured image" ) . ""; + } - if ( ( $send || $thumbnail || $delete ) && !isset($form_fields['buttons']) ) - $form_fields['buttons'] = array('tr' => "\t\t\n"); + if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) + $form_fields['buttons'] = array( 'tr' => "\t\t\n" ); $hidden_fields = array(); foreach ( $form_fields as $id => $field ) { - if ( $id{0} == '_' ) + if ( $id[0] == '_' ) continue; - if ( !empty($field['tr']) ) { + if ( !empty( $field['tr'] ) ) { $item .= $field['tr']; continue; } - $field = array_merge($defaults, $field); + $field = array_merge( $defaults, $field ); $name = "attachments[$attachment_id][$id]"; if ( $field['input'] == 'hidden' ) { @@ -1277,30 +1351,33 @@ function get_media_item( $attachment_id, $args = null ) { continue; } - $required = $field['required'] ? '*' : ''; + $required = $field['required'] ? '*' : ''; $aria_required = $field['required'] ? " aria-required='true' " : ''; $class = $id; $class .= $field['required'] ? ' form-required' : ''; - $item .= "\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n"; $extra_rows = array(); - if ( !empty($field['errors']) ) - foreach ( array_unique((array) $field['errors']) as $error ) + if ( !empty( $field['errors'] ) ) + foreach ( array_unique( (array) $field['errors'] ) as $error ) $extra_rows['error'][] = $error; - if ( !empty($field['extra_rows']) ) + if ( !empty( $field['extra_rows'] ) ) foreach ( $field['extra_rows'] as $class => $rows ) foreach ( (array) $rows as $html ) $extra_rows[$class][] = $html; @@ -1310,7 +1387,7 @@ function get_media_item( $attachment_id, $args = null ) { $item .= "\t\t\n"; } - if ( !empty($form_fields['_final']) ) + if ( !empty( $form_fields['_final'] ) ) $item .= "\t\t\n"; $item .= "\t\n"; $item .= "\t
" . __('File name:') . " $filename
" . __('File type:') . " $post->post_mime_type
" . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ) . "
+

+

$image_edit_button

+ 		+

" . __('File name:') . " $filename

+

" . __('File type:') . " $post->post_mime_type

+

" . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ). '

'; + if ( !empty( $media_dims ) ) + $item .= "

" . __('Dimensions:') . " $media_dims

\n"; + + $item .= "
" . __('Dimensions:') . " $media_dims
$image_edit_button
$send $thumbnail $delete
$send $thumbnail $delete
"; - if ( !empty($field[$field['input']]) ) - $item .= $field[$field['input']]; + $item .= "\t\t
"; + if ( !empty( $field[ $field['input'] ] ) ) + $item .= $field[ $field['input'] ]; elseif ( $field['input'] == 'textarea' ) { - $item .= ""; + if ( user_can_richedit() ) { // textarea_escaped when user_can_richedit() = false + $field['value'] = esc_textarea( $field['value'] ); + } + $item .= "'; } else { - $item .= ""; + $item .= ""; } - if ( !empty($field['helps']) ) - $item .= "

" . join( "

\n

", array_unique((array) $field['helps']) ) . '

'; + if ( !empty( $field['helps'] ) ) + $item .= "

" . join( "

\n

", array_unique( (array) $field['helps'] ) ) . '

'; $item .= "
$html
{$form_fields['_final']}
\n"; @@ -1318,11 +1395,10 @@ function get_media_item( $attachment_id, $args = null ) { foreach ( $hidden_fields as $name => $value ) $item .= "\t\n"; - if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) { + if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) { $parent = (int) $_REQUEST['post_id']; $parent_name = "attachments[$attachment_id][post_parent]"; - - $item .= "\t\n"; + $item .= "\t\n"; } return $item; @@ -1331,7 +1407,7 @@ function get_media_item( $attachment_id, $args = null ) { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 */ function media_upload_header() { ?> @@ -1345,23 +1421,33 @@ function media_upload_header() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $errors */ function media_upload_form( $errors = null ) { - global $type, $tab; + global $type, $tab, $pagenow; $flash_action_url = admin_url('async-upload.php'); // If Mac and mod_security, no Flash. :( $flash = true; - if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security') ) + if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'mac') && apache_mod_loaded('mod_security') ) $flash = false; $flash = apply_filters('flash_uploader', $flash); $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; + $upload_size_unit = $max_upload_size = wp_max_upload_size(); + $sizes = array( 'KB', 'MB', 'GB' ); + for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) + $upload_size_unit /= 1024; + if ( $u < 0 ) { + $upload_size_unit = 0; + $u = 0; + } else { + $upload_size_unit = (int) $upload_size_unit; + } ?> -
+
@@ -1443,6 +1558,7 @@ SWFUpload.onload = function() {
+

@@ -1451,12 +1567,15 @@ SWFUpload.onload = function() {

- - + + + +

+

-

+

@@ -1467,7 +1586,7 @@ SWFUpload.onload = function() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $type * @param unknown_type $errors @@ -1476,14 +1595,14 @@ SWFUpload.onload = function() { function media_upload_type_form($type = 'file', $errors = null, $id = null) { media_upload_header(); - $post_id = intval($_REQUEST['post_id']); + $post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0; $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id"); $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); ?>
- + @@ -1516,15 +1635,16 @@ if ( $id ) { ?>

- +

+ '; + else document.getElementById('status_img').innerHTML = ''; }, updateImageData : function() { @@ -1607,7 +1727,7 @@ var addExtImage = { t.width = t.preloadImg.width; t.height = t.preloadImg.height; document.getElementById('go_button').style.color = '#333'; - document.getElementById('status_img').innerHTML = ''; + document.getElementById('status_img').innerHTML = ''; }, getImageData : function() { @@ -1617,7 +1737,7 @@ var addExtImage = { t.resetImageData(); return false; } - document.getElementById('status_img').innerHTML = ''; + document.getElementById('status_img').innerHTML = ''; t.preloadImg = new Image(); t.preloadImg.onload = t.updateImageData; t.preloadImg.onerror = t.resetImageData; @@ -1642,7 +1762,7 @@ var addExtImage = { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $errors */ @@ -1677,7 +1797,7 @@ jQuery(function($){ | | - +
@@ -1783,7 +1904,7 @@ jQuery(function($){ /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.5.0 * * @param unknown_type $errors */ @@ -1803,7 +1924,7 @@ function media_upload_library_form($errors) { $start = ( $_GET['paged'] - 1 ) * 10; if ( $start < 1 ) $start = 0; - add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) ); + add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) ); list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query(); @@ -1818,7 +1939,7 @@ function media_upload_library_form($errors) { @@ -1905,7 +2026,7 @@ foreach ($arc_result as $arc_row) { - + @@ -1935,7 +2056,7 @@ jQuery(function($){

- +

@@ -1945,12 +2066,11 @@ jQuery(function($){ /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.7.0 * * @return unknown */ function type_url_form_image() { - if ( !apply_filters( 'disable_captions', '' ) ) { $caption = ' @@ -2019,13 +2139,7 @@ function type_url_form_image() {

' . __('Enter a link URL or click above for presets.') . '

- - - - - - - + ' . _insert_into_post_button('image') . ' '; @@ -2034,7 +2148,7 @@ function type_url_form_image() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.7.0 * * @return unknown */ @@ -2056,12 +2170,7 @@ function type_url_form_audio() { ' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . ' - - - - - - + ' . _insert_into_post_button('audio') . ' '; } @@ -2069,7 +2178,7 @@ function type_url_form_audio() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.7.0 * * @return unknown */ @@ -2090,13 +2199,8 @@ function type_url_form_video() { - ' . __('Link text, e.g. “Lucy on YouTube“') . ' - - - - - - + ' . __('Link text, e.g. “Lucy on YouTube”') . ' + ' . _insert_into_post_button('video') . ' '; } @@ -2104,7 +2208,7 @@ function type_url_form_video() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.7.0 * * @return unknown */ @@ -2126,14 +2230,34 @@ function type_url_form_file() { ' . __('Link text, e.g. “Ransom Demands (PDF)”') . ' + ' . _insert_into_post_button('file') . ' + +'; +} + + +function _insert_into_post_button($type) { + if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') ) + return ''; + + if ( 'image' == $type ) + return ' - + - -'; + '; + + return ' + + + + ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . ' + + + '; } /** @@ -2141,7 +2265,7 @@ function type_url_form_file() { * * Support a GET parameter for disabling the flash uploader. * - * @since unknown + * @since 2.6.0 * * @param unknown_type $flash * @return unknown @@ -2157,7 +2281,7 @@ add_filter('flash_uploader', 'media_upload_use_flash'); /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.6.0 */ function media_upload_flash_bypass() { echo '

'; @@ -2168,10 +2292,10 @@ function media_upload_flash_bypass() { /** * {@internal Missing Short Description}} * - * @since unknown + * @since 2.6.0 */ function media_upload_html_bypass($flash = true) { - echo '

'; + echo '

'; _e('You are using the Browser uploader.'); if ( $flash ) { // the user manually selected the browser uploader, so let them switch back to Flash @@ -2189,7 +2313,7 @@ add_action('post-html-upload-ui', 'media_upload_html_bypass'); * * Make sure the GET parameter sticks when we submit a form. * - * @since unknown + * @since 2.6.0 * * @param unknown_type $url * @return unknown @@ -2215,4 +2339,3 @@ add_action('media_upload_file', 'media_upload_file'); add_filter('media_upload_gallery', 'media_upload_gallery'); add_filter('media_upload_library', 'media_upload_library'); -