Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 21377) +++ wp-admin/includes/media.php (working copy) @@ -6,13 +6,77 @@ * @subpackage Administration */ +add_action( 'media_buttons', 'media_buttons' ); + +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 ); +add_filter( 'async_upload_file', 'get_media_item', 10, 2 ); + +add_action( 'media_upload_image', 'wp_media_upload_handler' ); +add_action( 'media_upload_audio', 'wp_media_upload_handler' ); +add_action( 'media_upload_video', 'wp_media_upload_handler' ); +add_action( 'media_upload_file', 'wp_media_upload_handler' ); + +add_filter( 'media_upload_gallery', 'media_upload_iframe' ); +add_filter( 'media_upload_library', 'media_upload_iframe' ); + +add_filter( 'media_upload_tabs', 'update_gallery_tab'); +add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); + + /** - * {@internal Missing Short Description}} + * Echoes the html for media upload buttons + * added to the action call for 'media_buttons' * + * @uses get_upload_iframe_src() * @since 2.5.0 + */ +function media_buttons($editor_id = 'content') { + $context = apply_filters('media_buttons_context', __('Upload/Insert %s')); + + $img = ''; + + echo '' . sprintf( $context, $img ) . ''; +} + +/** + * Determine url of the upload thickbox to be used in the media_buttons() link * - * @return unknown + * @uses apply_filters() calls $type . '_upload_iframe_src' + * @param string $type + * @param int $post_id + * @param string $tab + * @since unknown */ +function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { + global $post_ID; + + if ( empty( $post_id ) ) + $post_id = $post_ID; + + $upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') ); + + if ( $type && 'media' != $type ) + $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src); + + if ( ! empty( $tab ) ) + $upload_iframe_src = add_query_arg('tab', $tab, $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); +} + +/** + * Defines media tabs to be used in thickbox + * + * @since 2.5.0 + * + * @uses apply_filters() calls media_upload_tabs + * + * @return an associative array of tab names in the form of type=>name + */ function media_upload_tabs() { $_default_tabs = array( 'type' => __('From Computer'), // handler action suffix => tab text @@ -25,12 +89,13 @@ } /** - * {@internal Missing Short Description}} + * Added to media_upload_tabs filter to define the gallery tab + * checks for attachments and removes gallery tab if the current post has none. * * @since 2.5.0 * - * @param unknown_type $tabs - * @return unknown + * @param array $tabs + * @return an associative array of tab names in the form of type=>name */ function update_gallery_tab($tabs) { global $wpdb; @@ -54,10 +119,9 @@ return $tabs; } -add_filter('media_upload_tabs', 'update_gallery_tab'); /** - * {@internal Missing Short Description}} + * Echoes the thickbox media upload tabs to the screen * * @since 2.5.0 */ @@ -65,9 +129,10 @@ global $redir_tab; $tabs = media_upload_tabs(); $default = 'type'; - + $html = ''; + if ( !empty($tabs) ) { - echo "\n"; } + echo $html; } /** - * {@internal Missing Short Description}} + * Creates the html for an image as it is added to the editor * * @since 2.5.0 * + * @uses apply_filters() calls image_send_to_editor * @param unknown_type $id * @param unknown_type $alt * @param unknown_type $title @@ -101,7 +168,7 @@ * @param unknown_type $url * @param unknown_type $rel * @param unknown_type $size - * @return unknown + * @return string - the html for an image tag */ function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') { @@ -118,7 +185,7 @@ } /** - * {@internal Missing Short Description}} + * Wraps an image in the caption code * * @since 2.6.0 * @@ -156,7 +223,6 @@ return apply_filters( 'image_add_caption_shortcode', $shcode, $html ); } -add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); /** * Private preg_replace callback used in image_add_caption() @@ -170,11 +236,11 @@ } /** - * {@internal Missing Short Description}} + * Echoes the javascript used to send html back to the editor * * @since 2.5.0 * - * @param unknown_type $html + * @param string $html */ function media_send_to_editor($html) { ?> @@ -189,8 +255,6 @@ } /** - * {@internal Missing Short Description}} - * * This handles the file upload POST itself, creating the attachment post. * * @since 2.5.0 @@ -260,6 +324,11 @@ * * @since 2.6.0 * + * @uses wp_handle_sideload + * @uses wp_read_image_metadata + * @uses wp_insert_attachment + * @uses wp_update_attachment_metadata + * @uses wp_generate_attachment_metadata * @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 @@ -312,8 +381,49 @@ } /** - * {@internal Missing Short Description}} + * Pass thru to media_upload_iframe() for backcompat - not actually used anywhere + */ +function media_upload_gallery() { + media_upload_iframe( 'gallery' ); +} + +/** + * Pass thru to media_upload_iframe() for backcompat - not actually used anywhere + */ +function media_upload_library() { + media_upload_iframe( 'library' ); +} + +/** + * Returns wp_iframe with the proper upload form for media uploads + * added to the media_upload filter in media-upload.php * + * @since 3.5.0 + * + * @return HTML from the wp_iframe function + */ +function media_upload_iframe() { + $errors = array(); + $current_filter = current_filter(); + $type = str_replace( 'media_upload_' , '' , $current_filter ); + + if ( !empty($_POST) || empty($type) ) { + $return = media_upload_form_handler(); + if ( is_string($return) ) + return $return; + if ( is_array($return) ) + $errors = $return; + } + + wp_enqueue_script('admin-gallery'); + + wp_iframe( 'media_upload_form_html' , $type , $errors ); + +} + +/** + * Generates html for the iframe used in the thickbox window for uploads + * * Wrap iframe content (produced by $content_func) in a doctype, html head/body * etc any additional function args will be passed to content_func. * @@ -324,6 +434,7 @@ function wp_iframe($content_func /* ... */) { _wp_admin_html_begin(); ?> + <?php bloginfo('name') ?> › <?php _e('Uploads'); ?> — <?php _e('WordPress'); ?> '; - - echo '' . sprintf( $context, $img ) . ''; -} -add_action( 'media_buttons', 'media_buttons' ); - -function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { - global $post_ID; - - if ( empty( $post_id ) ) - $post_id = $post_ID; - - $upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') ); - - if ( $type && 'media' != $type ) - $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src); - - if ( ! empty( $tab ) ) - $upload_iframe_src = add_query_arg('tab', $tab, $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}} * @@ -553,7 +632,7 @@ return media_send_to_editor($html); } - + if ( !empty($_POST) ) { $return = media_upload_form_handler(); @@ -565,16 +644,16 @@ if ( isset($_POST['save']) ) { $errors['upload_notice'] = __('Saved.'); - return media_upload_gallery(); + return media_upload('gallery'); } - + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) { - $type = 'image'; + $type = 'url'; if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) $type = $_GET['type']; + return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id ); } - return wp_iframe( 'media_upload_type_form', 'image', $errors, $id ); } @@ -625,50 +704,6 @@ } /** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function media_upload_gallery() { - $errors = array(); - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - wp_enqueue_script('admin-gallery'); - return wp_iframe( 'media_upload_gallery_form', $errors ); -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function media_upload_library() { - $errors = array(); - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - return wp_iframe( 'media_upload_library_form', $errors ); -} - -/** * Retrieve HTML for the image alignment radio buttons with the specified one checked. * * @since 2.7.0 @@ -1407,87 +1442,49 @@ do_action('post-upload-ui'); } -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @param unknown_type $type - * @param unknown_type $errors - * @param unknown_type $id +// Start replaced functions + +/* + * Pass thru for backcompat - cot actually used anywhere */ -function media_upload_type_form($type = 'file', $errors = null, $id = null) { - - media_upload_header(); - - $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); - $form_class = 'media-upload-form type-form validate'; - - if ( get_user_setting('uploader') ) - $form_class .= ' html-uploader'; -?> - -
- - - - -

- - - - -
'.esc_html($id->get_error_message()).'
'; - exit; - } +function media_upload_type_form($type = 'image', $errors = null, $id = null) { + media_upload_form_html( $type, $errors, $id); } -?> - -

- -

-
- -
- - + -

+
+ + + + + + + | + | + +
+ + - - -
-
- -
-
-
- - -
- - - - - - - | - | - -
- + + jQuery(document).ready( function($) { + $('.media-types input').click( function() { + $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') ); + }); + }); + + //]]> + - -
- - - - - - - - - - -
- - add_query_arg( 'paged', '%#%' ), - 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => ceil($wp_query->found_posts / 10), - 'current' => $_GET['paged'] -)); - -if ( $page_links ) - echo "
$page_links
"; -?> - -
-posts WHERE post_type = 'attachment' ORDER BY post_date DESC"; - -$arc_result = $wpdb->get_results( $arc_query ); - -$month_count = count($arc_result); - -if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> - - - - - -
- -
-
-
- -
- - - - - - -
- - -
-

- - -

-
-' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '

'; } -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 ); -add_filter( 'async_upload_file', 'get_media_item', 10, 2 ); +function wp_upload_form( $args ) { + + $defaults = array( + 'post_id' => NULL, + 'type' => 'file', + 'inline' => false, + 'form_class' => 'media-upload-form type-form validate', + 'errors' => array(), + ); + + $args = wp_parse_args( $args, $defaults ); + + extract( $args ); + + wp_enqueue_script('plupload-handlers'); + wp_enqueue_script('image-edit'); + wp_enqueue_script('set-post-thumbnail' ); + wp_enqueue_style('imgareaselect'); + wp_enqueue_script( 'media-gallery' ); -add_action( 'media_upload_image', 'wp_media_upload_handler' ); -add_action( 'media_upload_audio', 'wp_media_upload_handler' ); -add_action( 'media_upload_video', 'wp_media_upload_handler' ); -add_action( 'media_upload_file', 'wp_media_upload_handler' ); + ?> +
+ -add_filter( 'media_upload_gallery', 'media_upload_gallery' ); -add_filter( 'media_upload_library', 'media_upload_library' ); + + + + + + +
+ + + + + + + +
+ + '.esc_html($id->get_error_message()).'
'; + exit; + } + } + ?> + + +

+ +

+
+ + + + + + +