<?php bloginfo('name') ?> › <?php _e('Uploads'); ?>

X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/99a64b9fd0d5ebb21c33c3a0b5865e9c412b430c..refs/tags/wordpress-3.3:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index def23433..ff77e6c0 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -62,9 +62,16 @@ add_filter('media_upload_tabs', 'update_gallery_tab'); * @since 2.5.0 */ function the_media_upload_tabs() { - global $redir_tab; + global $redir_tab, $is_iphone; $tabs = media_upload_tabs(); + if ( $is_iphone ) { + unset($tabs['type']); + $default = 'type_url'; + } else { + $default = 'type'; + } + if ( !empty($tabs) ) { echo "

$text

$link

<?php bloginfo('name') ?> › <?php _e('Uploads'); ?> — <?php _e('WordPress'); ?>

class="no-js"> '; + + echo '' . sprintf( $context, $img ) . ''; } add_action( 'media_buttons', 'media_buttons' ); -function _media_button($title, $icon, $type) { - return "

"; +function _media_button($title, $icon, $type, $id) { + return "

"; } -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'); +function get_upload_iframe_src( $type = null ) { + global $post_ID; - if ( 'media' != $type ) + $uploading_iframe_ID = (int) $post_ID; + $upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, admin_url('media-upload.php') ); + + if ( $type && '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); @@ -516,7 +499,9 @@ function media_upload_form_handler() { * * @return unknown */ -function media_upload_image() { +function wp_media_upload_handler() { + global $is_iphone; + $errors = array(); $id = 0; @@ -532,20 +517,37 @@ function media_upload_image() { } if ( !empty($_POST['insertonlybutton']) ) { - $alt = $align = ''; - - $src = $_POST['insertonly']['src']; + $src = $_POST['src']; if ( !empty($src) && !strpos($src, '://') ) $src = "http://$src"; - $alt = esc_attr($_POST['insertonly']['alt']); - if ( isset($_POST['insertonly']['align']) ) { - $align = esc_attr($_POST['insertonly']['align']); - $class = " class='align$align'"; + + if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) { + $title = esc_html( stripslashes( $_POST['title'] ) ); + if ( empty( $title ) ) + $title = esc_html( basename( $src ) ); + + if ( $title && $src ) + $html = "$title"; + + $type = 'file'; + if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) ) + && ( 'audio' == $ext_type || 'video' == $ext_type ) ) + $type = $ext_type; + + $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title ); + } else { + $align = ''; + $alt = esc_attr( stripslashes( $_POST['alt'] ) ); + if ( isset($_POST['align']) ) { + $align = esc_attr( stripslashes( $_POST['align'] ) ); + $class = " class='align$align'"; + } + if ( !empty($src) ) + $html = " $alt

"; + + $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align ); } - if ( !empty($src) ) - $html = " $alt

"; - $html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align); return media_send_to_editor($html); } @@ -563,10 +565,17 @@ function media_upload_image() { return media_upload_gallery(); } - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) - return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) { + $type = 'image'; + 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 ); + if ( $is_iphone ) + return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); + else + return wp_iframe( 'media_upload_type_form', 'image', $errors, $id ); } /** @@ -615,180 +624,6 @@ function media_sideload_image($file, $post_id, $desc = null) { } } -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function media_upload_audio() { - $errors = array(); - $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); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = esc_attr( 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); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - 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 2.5.0 - * - * @return unknown - */ -function media_upload_video() { - $errors = array(); - $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); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = esc_attr( 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); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - 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 2.5.0 - * - * @return unknown - */ -function media_upload_file() { - $errors = array(); - $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); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $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, esc_url_raw($href), $title); - return media_send_to_editor($html); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - 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}} * @@ -873,7 +708,7 @@ function image_align_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')); + $size_names = apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) ); if ( empty($check) ) $check = get_user_setting('imgsize', 'medium'); @@ -943,7 +778,7 @@ function image_link_input_fields($post, $url_type = '') {
- + "; } @@ -1181,7 +1016,7 @@ function get_media_items( $post_id, $errors ) { if ( $attachment->post_status == 'trash' ) continue; if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) - $output .= "\n

$item\n

"; + $output .= "\n

$item\n

"; } return $output; @@ -1205,8 +1040,9 @@ function get_media_item( $attachment_id, $args = null ) { $thumb_url = false; $post = get_post( $attachment_id ); + $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0; - $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 ); + $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), '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 ); @@ -1236,7 +1072,7 @@ function get_media_item( $attachment_id, $args = null ) { $toggle_on $toggle_off"; } else { - $class = 'form-table'; + $class = ''; $toggle_links = ''; } @@ -1281,7 +1117,7 @@ function get_media_item( $attachment_id, $args = null ) { -

$image_edit_button

@@ -1333,7 +1169,8 @@ function get_media_item( $attachment_id, $args = null ) { $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 ) { + if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) + && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && 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" ) . ""; } @@ -1435,22 +1272,23 @@ function media_upload_header() { * @param unknown_type $errors */ function media_upload_form( $errors = null ) { - global $type, $tab, $pagenow; - - $flash_action_url = admin_url('async-upload.php'); + global $type, $tab, $pagenow, $is_IE, $is_opera, $is_iphone; - // If Mac and mod_security, no Flash. :( - $flash = true; - if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'mac') && apache_mod_loaded('mod_security') ) - $flash = false; + if ( $is_iphone ) + return; - $flash = apply_filters('flash_uploader', $flash); + $upload_action_url = admin_url('async-upload.php'); $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; + $_type = isset($type) ? $type : ''; + $_tab = isset($tab) ? $tab : ''; - $upload_size_unit = $max_upload_size = wp_max_upload_size(); + $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++ ) + + 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; @@ -1458,26 +1296,19 @@ function media_upload_form( $errors = null ) { $upload_size_unit = (int) $upload_size_unit; } ?> - -

- - - -

- - get_error_message(); ?> - -

+ +

get_error_message(); + +?>

$post_id, - "auth_cookie" => (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]), - "logged_in_cookie" => $_COOKIE[LOGGED_IN_COOKIE], "_wpnonce" => wp_create_nonce('media-form'), - "type" => $type, - "tab" => $tab, + "type" => $_type, + "tab" => $_tab, "short" => "1", ); -$post_params = apply_filters( 'swfupload_post_params', $post_params ); -$p = array(); -foreach ( $post_params as $param => $val ) - $p[] = "\t\t'$param' : '$val'"; -$post_params_str = implode( ", \n", $p ); - -// #8545. wmode=transparent cannot be used with SWFUpload -if ( 'media-new.php' == $pagenow ) { - $upload_image_path = get_user_option( 'admin_color' ); - if ( 'classic' != $upload_image_path ) - $upload_image_path = 'fresh'; - $upload_image_path = admin_url( 'images/upload-' . $upload_image_path . '.png?ver=20101205' ); -} else { - $upload_image_path = includes_url( 'images/upload.png?ver=20100531' ); -} + +$post_params = apply_filters( 'upload_post_params', $post_params ); // hook change! old name: 'swfupload_post_params' + +$plupload_init = array( + 'runtimes' => 'html5,silverlight,flash,html4', + 'browse_button' => 'plupload-browse-button', + 'container' => 'plupload-upload-ui', + 'drop_element' => 'drag-drop-area', + 'file_data_name' => 'async-upload', + 'multiple_queues' => true, + 'max_file_size' => $max_upload_size . 'b', + 'url' => $upload_action_url, + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'), + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'), + 'filters' => array( array('title' => __( 'Allowed Files' ), 'extensions' => '*') ), + 'multipart' => true, + 'urlstream_upload' => true, + 'multipart_params' => $post_params +); + +$plupload_init = apply_filters( 'plupload_init', $plupload_init ); ?> + -

- - -

- -

- +

+ +

- -

- + +

> +

@@ -1582,14 +1384,16 @@ SWFUpload.onload = function() {

- -

- - +

- + + 100 * 1024 * 1024 ) { ?> + + -

'; exit; } } -?> -

+?>

@@ -1659,24 +1472,27 @@ if ( $id ) { * @param unknown_type $errors * @param unknown_type $id */ -function media_upload_type_url_form($type = 'file', $errors = null, $id = null) { +function media_upload_type_url_form($type = null, $errors = null, $id = null) { + if ( null === $type ) + $type = 'image'; + 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); + $form_class = 'media-upload-form type-form validate'; - $callback = "type_url_form_$type"; + if ( get_user_setting('uploader') ) + $form_class .= ' html-uploader'; ?> - + - - -

- +