X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..4f4e083f6f77639c41e2b1ddb200de8e34301cee:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 1000d15b..e6e7b6b8 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1,91 +1,212 @@ __('Choose File'), // handler action suffix => tab text + 'type' => __('From Computer'), // handler action suffix => tab text + 'type_url' => __('From URL'), 'gallery' => __('Gallery'), - 'library' => __('Media Library'), + 'library' => __('Media Library') ); return apply_filters('media_upload_tabs', $_default_tabs); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $tabs + * @return unknown + */ function update_gallery_tab($tabs) { global $wpdb; + if ( !isset($_REQUEST['post_id']) ) { unset($tabs['gallery']); 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']))); + if ( empty($attachments) ) { + unset($tabs['gallery']); + return $tabs; + } + $tabs['gallery'] = sprintf(__('Gallery (%s)'), "$attachments"); return $tabs; } add_filter('media_upload_tabs', 'update_gallery_tab'); +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function the_media_upload_tabs() { + global $redir_tab; $tabs = media_upload_tabs(); if ( !empty($tabs) ) { echo "\n"; } } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $id + * @param unknown_type $alt + * @param unknown_type $title + * @param unknown_type $align + * @param unknown_type $url + * @param unknown_type $rel + * @param unknown_type $size + * @return unknown + */ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') { - $html = get_image_tag($id, $alt, $title, $align, $size); + $htmlalt = ( empty($alt) ) ? $title : $alt; + + $html = get_image_tag($id, $htmlalt, $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 ); return $html; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + * @param unknown_type $id + * @param unknown_type $alt + * @param unknown_type $title + * @param unknown_type $align + * @param unknown_type $url + * @param unknown_type $size + * @return unknown + */ +function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { + + 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]; + + $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html ); + if ( empty($align) ) + $align = 'none'; + + $alt = ! empty($alt) ? addslashes($alt) : ''; + + $shcode = '[caption id="' . $id . '" align="align' . $align + . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]'; + + return apply_filters( 'image_add_caption_shortcode', $shcode, $html ); +} +add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 ); + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + */ function media_send_to_editor($html) { - ?> +?> false); - $file = wp_handle_upload($_FILES[$file_id], $overrides); + + $time = current_time('mysql'); + if ( $post = get_post($post_id) ) { + if ( substr( $post->post_date, 0, 4 ) > 0 ) + $time = $post->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'] ); + 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 @@ -106,7 +227,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { ), $post_data ); // Save the data - $id = wp_insert_attachment($attachment, $file, $post_parent); + $id = wp_insert_attachment($attachment, $file, $post_id); if ( !is_wp_error($id) ) { wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); } @@ -115,9 +236,68 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) { } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file_array + * @param unknown_type $post_id + * @param unknown_type $desc + * @param unknown_type $post_data + * @return unknown + */ +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); + + if ( isset($file['error']) ) + return new WP_Error( 'upload_error', $file['error'] ); -// wrap iframe content (produced by $content_func) in a doctype, html head/body etc -// any additional function args will be passed to content_func + $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']; + } + + $title = @$desc; + + // 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_id); + if ( !is_wp_error($id) ) { + wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); + return $url; + } + return $id; +} + +/** + * {@internal Missing Short Description}} + * + * 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 + * + * @param unknown_type $content_func + */ function wp_iframe($content_func /* ... */) { ?> @@ -126,16 +306,21 @@ function wp_iframe($content_func /* ... */) { <?php bloginfo('name') ?> › <?php _e('Uploads'); ?> — <?php _e('WordPress'); ?> + $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' ); -function media_buttons_head() { -$siteurl = get_option('siteurl'); -echo "\n"; -} - -add_action( 'admin_print_scripts', 'media_buttons_head' ); - -function media_admin_css() { - wp_admin_css('css/media'); -} - -add_action('media_upload_media', 'media_upload_handler'); - +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ 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']) ) @@ -210,6 +395,13 @@ function media_upload_form_handler() { $post['post_title'] = $attachment['post_title']; if ( isset($attachment['post_excerpt']) ) $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']; + } $post = apply_filters('attachment_fields_to_save', $post, $attachment); @@ -226,19 +418,27 @@ function media_upload_form_handler() { wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false); } - if ( isset($_POST['insert-gallery']) ) - return media_send_to_editor('[gallery]'); + if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?> + + $html"; } + $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment); return media_send_to_editor($html); } @@ -246,7 +446,17 @@ function media_upload_form_handler() { return $errors; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_image() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -261,13 +471,14 @@ function media_upload_image() { $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 = apply_filters('image_send_to_editor_url', $html, $src, $alt, $align); return media_send_to_editor($html); } @@ -280,13 +491,66 @@ function media_upload_image() { $errors = $return; } - if ( isset($_POST['save']) ) + if ( isset($_POST['save']) ) { $errors['upload_notice'] = __('Saved.'); + return media_upload_gallery(); + } + + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); return wp_iframe( 'media_upload_type_form', 'image', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $file + * @param unknown_type $post_id + * @param unknown_type $desc + * @return unknown + */ +function media_sideload_image($file, $post_id, $desc = null) { + if (!empty($file) ) { + $file_array['name'] = basename($file); + $tmp = download_url($file); + $file_array['tmp_name'] = $tmp; + $desc = @$desc; + + if ( is_wp_error($tmp) ) { + @unlink($file_array['tmp_name']); + $file_array['tmp_name'] = ''; + } + + $id = media_handle_sideload($file_array, $post_id, $desc); + $src = $id; + + if ( is_wp_error($id) ) { + @unlink($file_array['tmp_name']); + return $id; + } + } + + if ( !empty($src) ) { + $alt = @$desc; + $html = "$alt"; + return $html; + } +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_audio() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -301,11 +565,12 @@ 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); if ( !empty($title) && !empty($href) ) $html = "$title"; + $html = apply_filters('audio_send_to_editor_url', $html, $href, $title); return media_send_to_editor($html); } @@ -318,13 +583,28 @@ function media_upload_audio() { $errors = $return; } - if ( isset($_POST['save']) ) + if ( isset($_POST['save']) ) { $errors['upload_notice'] = __('Saved.'); + return media_upload_gallery(); + } + + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id ); return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_video() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -339,11 +619,12 @@ function media_upload_video() { $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 = apply_filters('video_send_to_editor_url', $html, $href, $title); return media_send_to_editor($html); } @@ -356,13 +637,28 @@ function media_upload_video() { $errors = $return; } - if ( isset($_POST['save']) ) + if ( isset($_POST['save']) ) { $errors['upload_notice'] = __('Saved.'); + return media_upload_gallery(); + } + + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id ); return wp_iframe( 'media_upload_type_form', 'video', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_file() { + $errors = array(); + $id = 0; + if ( isset($_POST['html-upload']) && !empty($_FILES) ) { // Upload File button was clicked $id = media_handle_upload('async-upload', $_REQUEST['post_id']); @@ -377,11 +673,12 @@ 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 = apply_filters('file_send_to_editor_url', $html, $href, $title); return media_send_to_editor($html); } @@ -394,13 +691,27 @@ function media_upload_file() { $errors = $return; } - if ( isset($_POST['save']) ) + if ( isset($_POST['save']) ) { $errors['upload_notice'] = __('Saved.'); + return media_upload_gallery(); + } + + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) + return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id ); return wp_iframe( 'media_upload_type_form', 'file', $errors, $id ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_gallery() { + $errors = array(); + if ( !empty($_POST) ) { $return = media_upload_form_handler(); @@ -410,10 +721,19 @@ function media_upload_gallery() { $errors = $return; } + wp_enqueue_script('admin-gallery'); return wp_iframe( 'media_upload_gallery_form', $errors ); } +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ function media_upload_library() { + $errors = array(); if ( !empty($_POST) ) { $return = media_upload_form_handler(); @@ -426,51 +746,166 @@ function media_upload_library() { return wp_iframe( 'media_upload_library_form', $errors ); } +/** + * Retrieve HTML for the image alignment radio buttons with the specified one checked. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $checked + * @return unknown + */ +function image_align_input_fields( $post, $checked = '' ) { + + $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) { + $name = esc_attr($name); + $out[] = ""; + } + return join("\n", $out); +} + +/** + * Retrieve HTML for the size radio buttons with the specified one checked. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $checked + * @return unknown + */ +function image_size_input_fields( $post, $checked = '' ) { + + // 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 ) { + $downsize = image_downsize($post->ID, $size); + + // 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 .= ""; + // only show the dimensions if that choice is available + if ( $enabled ) + $html .= " "; + + $html .= '
'; + + $out[] = $html; + } + + return array( + 'label' => __('Size'), + 'input' => 'html', + 'html' => join("\n", $out), + ); +} + +/** + * Retrieve HTML for the Link URL buttons with the default link type as specified. + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $url_type + * @return unknown + */ +function image_link_input_fields($post, $url_type='') { + + $file = wp_get_attachment_url($post->ID); + $link = get_attachment_link($post->ID); + + $url = ''; + if ( $url_type == 'file' ) + $url = $file; + elseif ( $url_type == 'post' ) + $url = $link; + + return "
+ + + +"; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $form_fields + * @param unknown_type $post + * @return unknown + */ function image_attachment_fields_to_edit($form_fields, $post) { if ( substr($post->post_mime_type, 0, 5) == 'image' ) { $form_fields['post_title']['required'] = true; + $file = wp_get_attachment_url($post->ID); + + $form_fields['image_url']['value'] = $file; + $form_fields['post_excerpt']['label'] = __('Caption'); - $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"'); + $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image'); $form_fields['post_content']['label'] = __('Description'); - $thumb = wp_get_attachment_thumb_url($post->ID); - $form_fields['align'] = array( 'label' => __('Alignment'), 'input' => 'html', - 'html' => " - - - - - - - - \n", - ); - $form_fields['image-size'] = array( - 'label' => __('Size'), - 'input' => 'html', - 'html' => " - " . ( $thumb ? " - - " : '' ) . " - - - ", + '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')); } return $form_fields; } add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $form_fields + * @param unknown_type $post + * @return unknown + */ function media_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']); 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}} + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $attachment + * @return unknown + */ function image_attachment_fields_to_save($post, $attachment) { if ( substr($post['post_mime_type'], 0, 5) == 'image' ) { if ( strlen(trim($post['post_title'])) == 0 ) { @@ -484,6 +919,16 @@ function image_attachment_fields_to_save($post, $attachment) { add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $html + * @param unknown_type $attachment_id + * @param unknown_type $attachment + * @return unknown + */ function image_media_send_to_editor($html, $attachment_id, $attachment) { $post =& get_post($attachment_id); if ( substr($post->post_mime_type, 0, 5) == 'image' ) { @@ -509,15 +954,24 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3); +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $post + * @param unknown_type $errors + * @return unknown + */ function get_attachment_fields_to_edit($post, $errors = null) { if ( is_int($post) ) $post =& get_post($post); if ( is_array($post) ) $post = (object) $post; + $image_url = wp_get_attachment_url($post->ID); + $edit_post = sanitize_post($post, 'edit'); - $file = wp_get_attachment_url($post->ID); - $link = get_attachment_link($post->ID); $form_fields = array( 'post_title' => array( @@ -536,16 +990,20 @@ function get_attachment_fields_to_edit($post, $errors = null) { 'url' => array( 'label' => __('Link URL'), 'input' => 'html', - 'html' => " -
- - - - \n", + 'html' => image_link_input_fields($post, get_option('image_default_link_type')), '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' => isset($edit_post->post_url) ? $edit_post->post_url : '', + 'helps' => __('Location of the uploaded file.'), + ) ); foreach ( get_attachment_taxonomies($post) as $taxonomy ) { @@ -577,31 +1035,53 @@ function get_attachment_fields_to_edit($post, $errors = null) { return $form_fields; } +/** + * Retrieve HTML for media items of post gallery. + * + * The HTML markup retrieved will be created for the progress of SWF Upload + * component. Will also create link for showing and hiding the form to modify + * the image attachment. + * + * @since unknown + * + * @param int $post_id Optional. Post ID. + * @param array $errors Errors for attachment, if any. + * @return string + */ function get_media_items( $post_id, $errors ) { if ( $post_id ) { $post = get_post($post_id); if ( $post && $post->post_type == 'attachment' ) $attachments = array($post->ID => $post); else - $attachments = get_children("post_parent=$post_id&post_type=attachment&orderby=menu_order ASC, ID&order=DESC"); + $attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') ); } else { if ( is_array($GLOBALS['wp_the_query']->posts) ) foreach ( $GLOBALS['wp_the_query']->posts as $attachment ) $attachments[$attachment->ID] = $attachment; } - if ( empty($attachments) ) - return ''; - - foreach ( $attachments as $id => $attachment ) + $output = ''; + foreach ( (array) $attachments as $id => $attachment ) if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) $output .= "\n
$item\n
"; return $output; } +/** + * Retrieve HTML form for modifying the image attachment. + * + * @since unknown + * + * @param int $attachment_id Attachment ID for modification. + * @param string|array $args Optional. Override defaults. + * @return string HTML form for attachment. + */ function get_media_item( $attachment_id, $args = null ) { - $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true ); + 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 ); @@ -611,28 +1091,25 @@ function get_media_item( $attachment_id, $args = null ) { else return false; - $title_label = __('Title'); - $description_label = __('Description'); - $tags_label = __('Tags'); - $toggle_on = __('Show'); $toggle_off = __('Hide'); $post = get_post($attachment_id); $filename = basename($post->guid); - $title = attribute_escape($post->post_title); - $description = attribute_escape($post->post_content); + $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 = ""; + $type = ""; } $form_fields = get_attachment_fields_to_edit($post, $errors); @@ -648,11 +1125,28 @@ 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) . "
" : ''; + + $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false; + $order = ''; + + foreach ( $form_fields as $key => $val ) { + if ( 'menu_order' == $key ) { + if ( $gallery ) + $order = '
'; + else + $order = ''; + + unset($form_fields['menu_order']); + break; + } + } $item = " $type $toggle_links -
$display_title
+ $order + $display_title @@ -674,11 +1168,13 @@ function get_media_item( $attachment_id, $args = null ) { $delete_href = wp_nonce_url("post.php?action=delete-post&post=$attachment_id", 'delete-post_' . $attachment_id); if ( $send ) - $send = ""; + $send = ""; if ( $delete ) - $delete = "" . __('Delete') . ""; + $delete = "" . __('Delete') . ""; if ( ( $send || $delete ) && !isset($form_fields['buttons']) ) - $form_fields['buttons'] = array('tr' => "\t\t\n"); + $form_fields['buttons'] = array('tr' => "\t\t\n"); $hidden_fields = array(); @@ -700,6 +1196,7 @@ function get_media_item( $attachment_id, $args = null ) { } $required = $field['required'] ? '*' : ''; + $aria_required = $field['required'] ? " aria-required='true' " : ''; $class = $id; $class .= $field['required'] ? ' form-required' : ''; @@ -707,9 +1204,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']) ) . '

'; @@ -737,11 +1234,23 @@ function get_media_item( $attachment_id, $args = null ) { $item .= "\t
$send $delete
$send $delete +
" . sprintf(__("You are about to delete %s."), $filename) . " " . __('Continue') . " + " . __('Cancel') . "
\n"; foreach ( $hidden_fields as $name => $value ) - $item .= "\t\n"; + $item .= "\t\n"; + + if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) { + $parent = (int) $_REQUEST['post_id']; + $parent_name = "attachments[$attachment_id][post_parent]"; + + $item .= "\t\n"; + } return $item; } +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ function media_upload_header() { ?> @@ -751,10 +1260,17 @@ function media_upload_header() { - +
@@ -776,25 +1301,35 @@ function media_upload_form( $errors = null ) { get_error_message(); ?>
+ + + -
-

-

-
+ +
+ +
+ +
+ +

+
-

- + +

+ +

- -
+

+
+ -
+ -

+ +

+ -
- +'.esc_html($id->get_error_message()).'
'; + exit; + } +} +?> - +

+ +

+ +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @param unknown_type $type + * @param unknown_type $errors + * @param unknown_type $id + */ +function media_upload_type_url_form($type = 'file', $errors = null, $id = null) { + media_upload_header(); -
-

-

-
+ $post_id = intval($_REQUEST['post_id']); + + $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); + + $callback = "type_url_form_$type"; +?> + + + + + + + +

+ +
- +
- +
- -
- - + + - + -
- - -
+ -

-

@@ -992,6 +1774,8 @@ unset($type_links); $page_links = paginate_links( array( 'base' => add_query_arg( 'paged', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => ceil($wp_query->found_posts / 10), 'current' => $_GET['paged'] )); @@ -1000,7 +1784,7 @@ if ( $page_links ) echo "
$page_links
"; ?> -
+
posts WHERE post_type = 'attachment' ORDER BY post_date DESC"; @@ -1023,15 +1807,15 @@ foreach ($arc_result as $arc_row) { else $default = ''; - echo ""; - echo wp_specialchars( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" ); + echo ""; + echo esc_html( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" ); echo "\n"; } ?> - +
@@ -1039,7 +1823,7 @@ foreach ($arc_result as $arc_row) {
-
+ @@ -1057,56 +1841,108 @@ jQuery(function($){
+
- +

+ +

+ + + + required + + + + - + * - +

+ - - * + - + +

' . $alt_help . '

- ' . __('Alternate text, e.g. "The Mona Lisa"') . ' + - +

- - - - - - - - + + + + + + + + + + + + + +
+ + + +

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

+ + - + '; + } -function type_form_audio() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_audio() { return ' @@ -1114,27 +1950,34 @@ function type_form_audio() { * - + - + - +
*
' . __('Link text, e.g. "Still Alive by Jonathan Coulton"') . '
' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . '
- +
'; } -function type_form_video() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_video() { return ' @@ -1142,27 +1985,34 @@ function type_form_video() { * - + - + - +
*
' . __('Link text, e.g. "Lucy on YouTube"') . '
' . __('Link text, e.g. “Lucy on YouTube“') . '
- +
'; } -function type_form_file() { +/** + * {@internal Missing Short Description}} + * + * @since unknown + * + * @return unknown + */ +function type_url_form_file() { return ' @@ -1170,26 +2020,92 @@ function type_form_file() { * - + - + - +
*
' . __('Link text, e.g. "Ransom Demands (PDF)"') . '
' . __('Link text, e.g. “Ransom Demands (PDF)”') . '
- +
'; } +/** + * {@internal Missing Short Description}} + * + * Support a GET parameter for disabling the flash uploader. + * + * @since unknown + * + * @param unknown_type $flash + * @return unknown + */ +function media_upload_use_flash($flash) { + if ( array_key_exists('flash', $_REQUEST) ) + $flash = !empty($_REQUEST['flash']); + return $flash; +} + +add_filter('flash_uploader', 'media_upload_use_flash'); + +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ +function media_upload_flash_bypass() { + echo '

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

'; +} + +/** + * {@internal Missing Short Description}} + * + * @since unknown + */ +function media_upload_html_bypass($flash = true) { + echo '

'; + _e('You are using the Browser uploader.'); + if ( $flash ) { + // the user manually selected the browser uploader, so let them switch back to Flash + 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'); +add_action('post-html-upload-ui', 'media_upload_html_bypass'); + +/** + * {@internal Missing Short Description}} + * + * Make sure the GET parameter sticks when we submit a form. + * + * @since unknown + * + * @param unknown_type $url + * @return unknown + */ +function media_upload_bypass_url($url) { + if ( array_key_exists('flash', $_REQUEST) ) + $url = add_query_arg('flash', intval($_REQUEST['flash'])); + return $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); @@ -1199,12 +2115,9 @@ add_action('media_upload_image', 'media_upload_image'); add_action('media_upload_audio', 'media_upload_audio'); add_action('media_upload_video', 'media_upload_video'); add_action('media_upload_file', 'media_upload_file'); -add_action('admin_head_media_upload_type_form', 'media_admin_css'); add_filter('media_upload_gallery', 'media_upload_gallery'); -add_action('admin_head_media_upload_gallery_form', 'media_admin_css'); add_filter('media_upload_library', 'media_upload_library'); -add_action('admin_head_media_upload_library_form', 'media_admin_css'); ?>