X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..refs/tags/wordpress-2.9:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 57e032ea..1bfe3e27 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -40,8 +40,10 @@ function update_gallery_tab($tabs) { return $tabs; } - if ( intval($_REQUEST['post_id']) ) - $attachments = intval($wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $_REQUEST['post_id']))); + $post_id = intval($_REQUEST['post_id']); + + if ( $post_id ) + $attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) ); if ( empty($attachments) ) { unset($tabs['gallery']); @@ -69,17 +71,16 @@ function the_media_upload_tabs() { $current = $redir_tab; elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) ) $current = $_GET['tab']; - else { - $keys = array_keys($tabs); - $current = array_shift($keys); - } + else + $current = apply_filters('media_upload_default_tab', 'type'); + foreach ( $tabs as $callback => $text ) { $class = ''; if ( $current == $callback ) $class = " class='current'"; $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false)); - $link = "$text"; - echo "\t
  • $link
    • \n"; + $link = "$text"; + echo "\t
  • $link
    • \n"; } echo "\n"; } @@ -99,18 +100,16 @@ function the_media_upload_tabs() { * @param unknown_type $size * @return unknown */ -function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') { - - $htmlalt = ( empty($alt) ) ? $title : $alt; +function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') { - $html = get_image_tag($id, $htmlalt, $title, $align, $size); + $html = get_image_tag($id, $alt, $title, $align, $size); - $rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : ''; + $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : ''; if ( $url ) - $html = '$html"; + $html = '$html"; - $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size ); + $html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt ); return $html; } @@ -129,26 +128,28 @@ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = fal * @param unknown_type $size * @return unknown */ -function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { +function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) { + + if ( empty($caption) || apply_filters( 'disable_captions', '' ) ) + return $html; - if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html; $id = ( 0 < (int) $id ) ? 'attachment_' . $id : ''; - preg_match( '/width="([0-9]+)/', $html, $matches ); - if ( ! isset($matches[1]) ) return $html; - $width = $matches[1]; + if ( ! preg_match( '/width="([0-9]+)/', $html, $matches ) ) + return $html; - $html = preg_replace( '/align[^\s\'"]+\s?/', '', $html ); - if ( empty($align) ) $align = 'none'; + $width = $matches[1]; - $alt = ! empty($alt) ? addslashes($alt) : ''; + $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html ); + if ( empty($align) ) + $align = 'none'; $shcode = '[caption id="' . $id . '" align="align' . $align - . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]'; + . '" width="' . $width . '" caption="' . addslashes($caption) . '"]' . $html . '[/caption]'; return apply_filters( 'image_add_caption_shortcode', $shcode, $html ); } -add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 ); +add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); /** * {@internal Missing Short Description}} @@ -165,7 +166,7 @@ var win = window.dialogArguments || opener || parent || top; win.send_to_editor(''); /* ]]> */ - post_date; } + $name = $_FILES[$file_id]['name']; $file = wp_handle_upload($_FILES[$file_id], $overrides, $time); if ( isset($file['error']) ) return new WP_Error( 'upload_error', $file['error'] ); + $name_parts = pathinfo($name); + $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) ); + $url = $file['url']; $type = $file['type']; $file = $file['file']; - $title = preg_replace('/\.[^.]+$/', '', basename($file)); + $title = $name; $content = ''; // use image exif/iptc data for title and caption defaults if possible @@ -241,8 +246,8 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { */ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) { $overrides = array('test_form'=>false); - $file = wp_handle_sideload($file_array, $overrides); + $file = wp_handle_sideload($file_array, $overrides); if ( isset($file['error']) ) return new WP_Error( 'upload_error', $file['error'] ); @@ -271,7 +276,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = 'post_content' => $content, ), $post_data ); - // Save the data + // Save the attachment metadata $id = wp_insert_attachment($attachment, $file, $post_id); if ( !is_wp_error($id) ) { wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); @@ -303,17 +308,24 @@ wp_enqueue_style( 'wp-admin' ); wp_enqueue_style( 'colors' ); if ( 0 === strpos( $content_func, 'media' ) ) wp_enqueue_style( 'media' ); - +wp_enqueue_style( 'ie' ); ?> @@ -323,7 +335,10 @@ if ( is_string($content_func) ) $args = func_get_args(); $args = array_slice($args, 1); call_user_func_array($content_func, $args); + + do_action('admin_print_footer_scripts'); ?> + $image_title - $video_title - $audio_title - $media_title + $image_title + $video_title + $audio_title + $media_title EOF; printf($context, $out); } add_action( 'media_buttons', 'media_buttons' ); -add_action('media_upload_media', 'media_upload_handler'); /** * {@internal Missing Short Description}} @@ -369,11 +383,13 @@ add_action('media_upload_media', 'media_upload_handler'); function media_upload_form_handler() { check_admin_referer('media-form'); + $errors = null; + if ( isset($_POST['send']) ) { $keys = array_keys($_POST['send']); $send_id = (int) array_shift($keys); } - + if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) { $post = $_post = get_post($attachment_id, ARRAY_A); if ( isset($attachment['post_content']) ) @@ -384,6 +400,7 @@ function media_upload_form_handler() { $post['post_excerpt'] = $attachment['post_excerpt']; if ( isset($attachment['menu_order']) ) $post['menu_order'] = $attachment['menu_order']; + if ( isset($send_id) && $attachment_id == $send_id ) { if ( isset($attachment['post_parent']) ) $post['post_parent'] = $attachment['post_parent']; @@ -391,6 +408,15 @@ function media_upload_form_handler() { $post = apply_filters('attachment_fields_to_save', $post, $attachment); + if ( isset($attachment['image_alt']) && !empty($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 ); + // update_meta expects slashed + update_post_meta( $attachment_id, '_wp_attachment_image_alt', addslashes($image_alt) ); + } + } + if ( isset($post['errors']) ) { $errors[$attachment_id] = $post['errors']; unset($post['errors']); @@ -399,9 +425,10 @@ function media_upload_form_handler() { if ( $post != $_post ) wp_update_post($post); - foreach ( get_attachment_taxonomies($post) as $t ) + foreach ( get_attachment_taxonomies($post) as $t ) { if ( isset($attachment[$t]) ) wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false); + } } if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?> @@ -417,12 +444,14 @@ function media_upload_form_handler() { if ( isset($send_id) ) { $attachment = stripslashes_deep( $_POST['attachments'][$send_id] ); + $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-".attribute_escape($send_id)."'"; + $rel = " rel='attachment wp-att-" . esc_attr($send_id)."'"; $html = "$html"; } + $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment); return media_send_to_editor($html); } @@ -452,16 +481,20 @@ function media_upload_image() { } if ( !empty($_POST['insertonlybutton']) ) { + $alt = $align = ''; + $src = $_POST['insertonly']['src']; if ( !empty($src) && !strpos($src, '://') ) $src = "http://$src"; - $alt = attribute_escape($_POST['insertonly']['alt']); + $alt = esc_attr($_POST['insertonly']['alt']); if ( isset($_POST['insertonly']['align']) ) { - $align = attribute_escape($_POST['insertonly']['align']); + $align = esc_attr($_POST['insertonly']['align']); $class = " class='align$align'"; } if ( !empty($src) ) - $html = "$alt"; + $html = "$alt"; + + $html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align); return media_send_to_editor($html); } @@ -497,25 +530,33 @@ function media_upload_image() { */ function media_sideload_image($file, $post_id, $desc = null) { if (!empty($file) ) { - $file_array['name'] = basename($file); + // Download file to temp location $tmp = download_url($file); + + // Set variables for storage + // fix file filename for query strings + preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches); + $file_array['name'] = basename($matches[0]); $file_array['tmp_name'] = $tmp; - $desc = @$desc; + // If error storing temporarily, unlink if ( is_wp_error($tmp) ) { @unlink($file_array['tmp_name']); $file_array['tmp_name'] = ''; } - $id = media_handle_sideload($file_array, $post_id, $desc); + // do the validation and storage stuff + $id = media_handle_sideload($file_array, $post_id, @$desc); $src = $id; + // If error storing permanently, unlink if ( is_wp_error($id) ) { @unlink($file_array['tmp_name']); return $id; } } + // Finally check to make sure the file has been saved, then return the html if ( !empty($src) ) { $alt = @$desc; $html = "$alt"; @@ -548,11 +589,16 @@ function media_upload_audio() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; - $title = attribute_escape($_POST['insertonly']['title']); + + $title = esc_attr($_POST['insertonly']['title']); if ( empty($title) ) - $title = basename($href); + $title = esc_attr( basename($href) ); + if ( !empty($title) && !empty($href) ) - $html = "$title"; + $html = "$title"; + + $html = apply_filters('audio_send_to_editor_url', $html, $href, $title); + return media_send_to_editor($html); } @@ -601,11 +647,16 @@ function media_upload_video() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; - $title = attribute_escape($_POST['insertonly']['title']); - if ( empty($title) ) - $title = basename($href); + + $title = esc_attr($_POST['insertonly']['title']); + if ( empty($title) ) + $title = esc_attr( basename($href) ); + if ( !empty($title) && !empty($href) ) - $html = "$title"; + $html = "$title"; + + $html = apply_filters('video_send_to_editor_url', $html, $href, $title); + return media_send_to_editor($html); } @@ -654,11 +705,13 @@ function media_upload_file() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; - $title = attribute_escape($_POST['insertonly']['title']); + + $title = esc_attr($_POST['insertonly']['title']); if ( empty($title) ) $title = basename($href); if ( !empty($title) && !empty($href) ) - $html = "$title"; + $html = "$title"; + $html = apply_filters('file_send_to_editor_url', $html, esc_url_raw($href), $title); return media_send_to_editor($html); } @@ -735,18 +788,21 @@ function media_upload_library() { * @param unknown_type $checked * @return unknown */ -function image_align_input_fields($post, $checked='') { +function image_align_input_fields( $post, $checked = '' ) { - $alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right'); - if ( !array_key_exists($checked, $alignments) ) + if ( empty($checked) ) + $checked = get_user_setting('align', 'none'); + + $alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right')); + if ( !array_key_exists( (string) $checked, $alignments ) ) $checked = 'none'; $out = array(); - foreach ($alignments as $name => $label) { - + foreach ( $alignments as $name => $label ) { + $name = esc_attr($name); $out[] = ""; + " />"; } return join("\n", $out); } @@ -760,27 +816,36 @@ function image_align_input_fields($post, $checked='') { * @param unknown_type $checked * @return unknown */ -function image_size_input_fields($post, $checked='') { +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')); - foreach ( $size_names as $size => $name) { + if ( empty($check) ) + $check = get_user_setting('imgsize', 'medium'); + + foreach ( $size_names as $size => $label ) { $downsize = image_downsize($post->ID, $size); + $checked = ''; // is this size selectable? $enabled = ( $downsize[3] || 'full' == $size ); $css_id = "image-size-{$size}-{$post->ID}"; // if this size is the default but that's not available, don't select it - if ( $checked && !$enabled ) - $checked = ''; - // if $checked was not specified, default to the first available size that's bigger than a thumbnail - if ( !$checked && $enabled && 'thumbnail' != $size ) - $checked = $size; - - $html = "
    "; - - $html .= ""; + if ( $size == $check ) { + if ( $enabled ) + $checked = " checked='checked'"; + else + $check = ''; + } elseif ( !$check && $enabled && 'thumbnail' != $size ) { + // if $check is not enabled, default to the first available size that's bigger than a thumbnail + $check = $size; + $checked = " checked='checked'"; + } + + $html = "
    "; + + $html .= ""; // only show the dimensions if that choice is available if ( $enabled ) $html .= " "; @@ -806,21 +871,25 @@ function image_size_input_fields($post, $checked='') { * @param unknown_type $url_type * @return unknown */ -function image_link_input_fields($post, $url_type='') { +function image_link_input_fields($post, $url_type = '') { $file = wp_get_attachment_url($post->ID); $link = get_attachment_link($post->ID); + if ( empty($url_type) ) + $url_type = get_user_setting('urlbutton', 'post'); + $url = ''; if ( $url_type == 'file' ) $url = $file; elseif ( $url_type == 'post' ) $url = $link; - return "
    - - - + return " +
    + + + "; } @@ -835,12 +904,17 @@ function image_link_input_fields($post, $url_type='') { */ function image_attachment_fields_to_edit($form_fields, $post) { if ( substr($post->post_mime_type, 0, 5) == 'image' ) { - $form_fields['post_title']['required'] = true; + $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true); + if ( empty($alt) ) + $alt = ''; - $form_fields['post_excerpt']['label'] = __('Caption'); - $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image'); + $form_fields['post_title']['required'] = true; - $form_fields['post_content']['label'] = __('Description'); + $form_fields['image_alt'] = array( + 'value' => $alt, + 'label' => __('Alternate text'), + 'helps' => __('Alt text for the image, e.g. “The Mona Lisa”') + ); $form_fields['align'] = array( 'label' => __('Alignment'), @@ -848,7 +922,10 @@ function image_attachment_fields_to_edit($form_fields, $post) { 'html' => image_align_input_fields($post, get_option('image_default_align')), ); - $form_fields['image-size'] = image_size_input_fields($post, get_option('image_default_size')); + $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') ); + + } else { + unset( $form_fields['image_alt'] ); } return $form_fields; } @@ -869,6 +946,11 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) { return $form_fields; } +function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { + unset($form_fields['image_url']); + return $form_fields; +} + /** * {@internal Missing Short Description}} * @@ -905,20 +987,12 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { $post =& get_post($attachment_id); if ( substr($post->post_mime_type, 0, 5) == 'image' ) { $url = $attachment['url']; - - if ( isset($attachment['align']) ) - $align = $attachment['align']; - else - $align = 'none'; - - if ( !empty($attachment['image-size']) ) - $size = $attachment['image-size']; - else - $size = 'medium'; - + $align = !empty($attachment['align']) ? $attachment['align'] : 'none'; + $size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium'; + $alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : ''; $rel = ( $url == get_attachment_link($attachment_id) ); - return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size); + return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt); } return $html; @@ -941,32 +1015,42 @@ function get_attachment_fields_to_edit($post, $errors = null) { if ( is_array($post) ) $post = (object) $post; + $image_url = wp_get_attachment_url($post->ID); + $edit_post = sanitize_post($post, 'edit'); $form_fields = array( 'post_title' => array( 'label' => __('Title'), - 'value' => $edit_post->post_title, + 'value' => $edit_post->post_title ), + 'image_alt' => array(), 'post_excerpt' => array( 'label' => __('Caption'), - 'value' => $edit_post->post_excerpt, + 'value' => $edit_post->post_excerpt ), 'post_content' => array( 'label' => __('Description'), 'value' => $edit_post->post_content, - 'input' => 'textarea', + 'input' => 'textarea' ), 'url' => array( 'label' => __('Link URL'), 'input' => 'html', 'html' => image_link_input_fields($post, get_option('image_default_link_type')), - 'helps' => __('Enter a link URL or click above for presets.'), + 'helps' => __('Enter a link URL or click above for presets.') ), 'menu_order' => array( 'label' => __('Order'), 'value' => $edit_post->menu_order ), + 'image_url' => array( + 'label' => __('File URL'), + 'input' => 'html', + 'html' => "
    ", + 'value' => wp_get_attachment_url($post->ID), + 'helps' => __('Location of the uploaded file.') + ) ); foreach ( get_attachment_taxonomies($post) as $taxonomy ) { @@ -1025,9 +1109,12 @@ function get_media_items( $post_id, $errors ) { } $output = ''; - foreach ( (array) $attachments as $id => $attachment ) + foreach ( (array) $attachments as $id => $attachment ) { + if ( $attachment->post_status == 'trash' ) + continue; if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) $output .= "\n
    $item\n
    "; + } return $output; } @@ -1044,36 +1131,33 @@ function get_media_items( $post_id, $errors ) { function get_media_item( $attachment_id, $args = null ) { global $redir_tab; - $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true ); - $args = wp_parse_args( $args, $default_args ); - extract( $args, EXTR_SKIP ); - - global $post_mime_types; if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) ) $thumb_url = $thumb_url[0]; else return false; + $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true ); + $args = wp_parse_args( $args, $default_args ); + extract( $args, EXTR_SKIP ); + $toggle_on = __('Show'); $toggle_off = __('Hide'); $post = get_post($attachment_id); $filename = basename($post->guid); - $title = attribute_escape($post->post_title); + $title = esc_attr($post->post_title); if ( $_tags = get_the_tags($attachment_id) ) { foreach ( $_tags as $tag ) $tags[] = $tag->name; - $tags = attribute_escape(join(', ', $tags)); + $tags = esc_attr(join(', ', $tags)); } - $type = ''; - if ( isset($post_mime_types) ) { - $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type)); - $type = array_shift($keys); - $type = ""; - } + $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); + $type_html = ""; $form_fields = get_attachment_fields_to_edit($post, $errors); @@ -1088,7 +1172,7 @@ 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; $order = ''; @@ -1105,22 +1189,41 @@ function get_media_item( $attachment_id, $args = null ) { } } + $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); + + $image_edit_button = ''; + if ( gd_edit_image_support($post->post_mime_type) ) { + $nonce = wp_create_nonce("image_editor-$post->ID"); + $image_edit_button = " "; + } + $item = " - $type + $type_html $toggle_links $order $display_title - + - - + + - - - + + \n"; + + if ( !empty($media_dims) ) + $item .= "\n"; + + $item .= " + - \n"; + + + \n"; $defaults = array( 'input' => 'text', @@ -1129,15 +1232,31 @@ function get_media_item( $attachment_id, $args = null ) { 'extra_rows' => array(), ); - $delete_href = wp_nonce_url("post.php?action=delete-post&post=$attachment_id", 'delete-post_' . $attachment_id); if ( $send ) - $send = ""; - if ( $delete ) - $delete = "" . __('Delete') . ""; - if ( ( $send || $delete ) && !isset($form_fields['buttons']) ) - $form_fields['buttons'] = array('tr' => "\t\t\n"); + $send = ""; + if ( $delete && current_user_can('delete_post', $attachment_id) ) { + if ( !EMPTY_TRASH_DAYS ) { + $delete = "" . __('Delete Permanently') . ""; + } elseif ( !MEDIA_TRASH ) { + $delete = "" . __('Delete') . "
    " . sprintf(__("You are about to delete %s."), $filename) . " " . __('Continue') . " " . __('Cancel') . "
    "; + } else { + $delete = "" . __('Move to Trash') . "" . __('Undo') . ""; + } + } else { + $delete = ''; + } + + $thumbnail = ''; + $calling_post_id = 0; + if ( isset( $_GET['post_id'] ) ) + $calling_post_id = $_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 ( ( $send || $thumbnail || $delete ) && !isset($form_fields['buttons']) ) + $form_fields['buttons'] = array('tr' => "\t\t\n"); $hidden_fields = array(); @@ -1167,9 +1286,9 @@ function get_media_item( $attachment_id, $args = null ) { if ( !empty($field[$field['input']]) ) $item .= $field[$field['input']]; elseif ( $field['input'] == 'textarea' ) { - $item .= ""; + $item .= ""; } else { - $item .= ""; + $item .= ""; } if ( !empty($field['helps']) ) $item .= "

    " . join( "

    \n

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

    '; @@ -1197,9 +1316,9 @@ function get_media_item( $attachment_id, $args = null ) { $item .= "\t
    $filename" . __('File name:') . " $filename
    $post->post_mime_type
    " . mysql2date($post->post_date, get_option('time_format')) . "
    " . apply_filters('media_meta', '', $post) . "
    " . __('File type:') . " $post->post_mime_type
    " . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ) . "
    " . __('Dimensions:') . " $media_dims
    $image_edit_button
    $send $delete -
    " . sprintf(__("You are about to delete %s."), $filename) . " " . __('Continue') . " - " . __('Cancel') . "
    $send $thumbnail $delete
    \n"; foreach ( $hidden_fields as $name => $value ) - $item .= "\t\n"; + $item .= "\t\n"; - if ( $post->post_parent < 1 && (int) $_REQUEST['post_id'] ) { + if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) { $parent = (int) $_REQUEST['post_id']; $parent_name = "attachments[$attachment_id][post_parent]"; @@ -1244,6 +1363,16 @@ function media_upload_form( $errors = null ) { $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; ?> +
    @@ -1259,22 +1388,25 @@ function media_upload_form( $errors = null ) {
    -
    +
    + +
    + +

    -

    - + +

    - -
    +

    - +
    -
    + + @@ -1355,7 +1492,7 @@ function media_upload_type_form($type = 'file', $errors = null, $id = null) {
    '.wp_specialchars($id->get_error_message()).'
    '; + echo '
    '.esc_html($id->get_error_message()).'
    '; exit; } } ?>
    - +

    + +

    - + @@ -1418,21 +1558,23 @@ var addExtImage = { align : 'alignnone', insert : function() { - var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = null; + var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = ''; - if ( '' == f.src.value || '' == t.width ) return false; + if ( '' == f.src.value || '' == t.width ) + return false; if ( f.title.value ) { - title = f.title.value.replace(/['"<>]+/g, ''); + title = f.title.value.replace(/'/g, ''').replace(/"/g, '"').replace(//g, '>'); title = ' title="'+title+'"'; } - if ( f.alt.value ) { - alt = f.alt.value.replace(/['"<>]+/g, ''); + if ( f.alt.value ) + alt = f.alt.value.replace(/'/g, ''').replace(/"/g, '"').replace(//g, '>'); + - caption = f.alt.value.replace(/'/g, ''').replace(/"/g, '"').replace(//g, '>'); + if ( f.caption.value ) + caption = f.caption.value.replace(/'/g, ''').replace(/"/g, '"').replace(//g, '>'); - } cls = caption ? '' : ' class="'+t.align+'"'; @@ -1446,6 +1588,7 @@ var addExtImage = { var win = window.dialogArguments || opener || parent || top; win.send_to_editor(html); + return false; }, resetImageData : function() { @@ -1454,8 +1597,8 @@ var addExtImage = { t.width = t.height = ''; document.getElementById('go_button').style.color = '#bbb'; if ( ! document.forms[0].src.value ) - document.getElementById('status_img').src = 'images/required.gif'; - else document.getElementById('status_img').src = 'images/no.png'; + document.getElementById('status_img').innerHTML = '*'; + else document.getElementById('status_img').innerHTML = ''; }, updateImageData : function() { @@ -1464,7 +1607,7 @@ var addExtImage = { t.width = t.preloadImg.width; t.height = t.preloadImg.height; document.getElementById('go_button').style.color = '#333'; - document.getElementById('status_img').src = 'images/yes.png'; + document.getElementById('status_img').innerHTML = ''; }, getImageData : function() { @@ -1474,7 +1617,7 @@ var addExtImage = { t.resetImageData(); return false; } - document.getElementById('status_img').src = 'images/loading.gif'; + document.getElementById('status_img').innerHTML = ''; t.preloadImg = new Image(); t.preloadImg.onload = t.updateImageData; t.preloadImg.onerror = t.resetImageData; @@ -1486,7 +1629,7 @@ var addExtImage = {
    - +
    @@ -1504,13 +1647,14 @@ var addExtImage = { * @param unknown_type $errors */ function media_upload_gallery_form($errors) { - global $redir_tab; + global $redir_tab, $type; $redir_tab = 'gallery'; media_upload_header(); $post_id = intval($_REQUEST['post_id']); - $form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=gallery&post_id=$post_id"); + $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id"); + $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); ?> - - @@ -1637,7 +1794,8 @@ function media_upload_library_form($errors) { $post_id = intval($_REQUEST['post_id']); - $form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=library&post_id=$post_id"); + $form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id"); + $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0; if ( $_GET['paged'] < 1 ) @@ -1652,15 +1810,15 @@ function media_upload_library_form($errors) { ?>
    - - + + - +
    @@ -1750,7 +1913,7 @@ foreach ($arc_result as $arc_row) {
    -
    + @@ -1768,10 +1931,11 @@ jQuery(function($){
    +

    - +

    @@ -1787,12 +1951,17 @@ jQuery(function($){ */ function type_url_form_image() { - if ( apply_filters( 'disable_captions', '' ) ) { - $alt = __('Alternate Text'); - $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"'); + if ( !apply_filters( 'disable_captions', '' ) ) { + $caption = ' + + + + + + +'; } else { - $alt = __('Image Caption'); - $alt_help = __('Also used as alternate text for the image'); + $caption = ''; } $default_align = get_option('image_default_align'); @@ -1800,11 +1969,12 @@ function type_url_form_image() { $default_align = 'none'; return ' +

    ' . __('Insert an image from another web site') . '

    - @@ -1814,17 +1984,17 @@ function type_url_form_image() { * - + +

    ' . __('Alt text for the image, e.g. “The Mona Lisa”') . '

    - + ' . $caption . '
    + - required + *

    - + -

    ' . $alt_help . '

    		@@ -1853,7 +2023,7 @@ function type_url_form_image() {
    - +
    @@ -1885,11 +2055,11 @@ function type_url_form_audio() { - ' . __('Link text, e.g. "Still Alive by Jonathan Coulton"') . ' + ' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . ' - + @@ -1920,11 +2090,11 @@ function type_url_form_video() { - ' . __('Link text, e.g. "Lucy on YouTube"') . ' + ' . __('Link text, e.g. “Lucy on YouTube“') . ' - + @@ -1955,11 +2125,11 @@ function type_url_form_file() { - ' . __('Link text, e.g. "Ransom Demands (PDF)"') . ' + ' . __('Link text, e.g. “Ransom Demands (PDF)”') . ' - + @@ -1991,7 +2161,7 @@ add_filter('flash_uploader', 'media_upload_use_flash'); */ function media_upload_flash_bypass() { echo '

    '; - printf( __('You are using the Flash uploader. Problems? Try the Browser uploader instead.'), clean_url(add_query_arg('flash', 0)) ); + printf( __('You are using the Flash uploader. Problems? Try the Browser uploader instead.'), esc_url(add_query_arg('flash', 0)) ); echo '

    '; } @@ -2000,16 +2170,15 @@ function media_upload_flash_bypass() { * * @since unknown */ -function media_upload_html_bypass() { +function media_upload_html_bypass($flash = true) { echo '

    '; - if ( array_key_exists('flash', $_REQUEST) ) + _e('You are using the Browser uploader.'); + if ( $flash ) { // the user manually selected the browser uploader, so let them switch back to Flash - printf( __('You are using the Browser uploader. Try the Flash uploader instead.'), clean_url(add_query_arg('flash', 1)) ); - else - // the user probably doesn't have Flash - printf( __('You are using the Browser uploader.') ); - - echo '

    '; + echo ' '; + printf( __('Try the Flash uploader instead.'), esc_url(add_query_arg('flash', 1)) ); + } + echo "

    \n"; } add_action('post-flash-upload-ui', 'media_upload_flash_bypass'); @@ -2033,8 +2202,6 @@ function media_upload_bypass_url($url) { add_filter('media_upload_form_url', 'media_upload_bypass_url'); - - add_filter('async_upload_image', 'get_media_item', 10, 2); add_filter('async_upload_audio', 'get_media_item', 10, 2); add_filter('async_upload_video', 'get_media_item', 10, 2); @@ -2049,4 +2216,3 @@ add_filter('media_upload_gallery', 'media_upload_gallery'); add_filter('media_upload_library', 'media_upload_library'); -?>