--- a/web/wp-admin/includes/media.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/includes/media.php Mon Nov 19 18:26:13 2012 +0100
@@ -9,7 +9,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @return unknown
*/
@@ -27,7 +27,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $tabs
* @return unknown
@@ -59,11 +59,12 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*/
function the_media_upload_tabs() {
global $redir_tab;
$tabs = media_upload_tabs();
+ $default = 'type';
if ( !empty($tabs) ) {
echo "<ul id='sidemenu'>\n";
@@ -72,13 +73,15 @@
elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
$current = $_GET['tab'];
else
- $current = apply_filters('media_upload_default_tab', 'type');
+ $current = apply_filters('media_upload_default_tab', $default);
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));
+
+ $href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
$link = "<a href='" . esc_url($href) . "'$class>$text</a>";
echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
}
@@ -89,7 +92,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $id
* @param unknown_type $alt
@@ -117,7 +120,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.6.0
*
* @param unknown_type $html
* @param unknown_type $id
@@ -135,26 +138,41 @@
$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
- if ( ! preg_match( '/width="([0-9]+)/', $html, $matches ) )
+ if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
return $html;
$width = $matches[1];
+ $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
+ $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
+ // convert any remaining line breaks to <br>
+ $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
+
$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="' . addslashes($caption) . '"]' . $html . '[/caption]';
+ $shcode = '[caption id="' . $id . '" align="align' . $align . '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
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()
+ *
+ * @access private
+ * @since 3.4.0
+ */
+function _cleanup_image_add_caption( $matches ) {
+ // remove any line breaks from inside the tags
+ return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
+}
+
+/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $html
*/
@@ -175,15 +193,15 @@
*
* This handles the file upload POST itself, creating the attachment post.
*
- * @since unknown
+ * @since 2.5.0
*
- * @param unknown_type $file_id
- * @param unknown_type $post_id
- * @param unknown_type $post_data
- * @return unknown
+ * @param string $file_id Index into the {@link $_FILES} array of the upload
+ * @param int $post_id The post ID the media is associated with
+ * @param array $post_data allows you to overwrite some of the attachment
+ * @param array $overrides allows you to override the {@link wp_handle_upload()} behavior
+ * @return int the ID of the attachment
*/
-function media_handle_upload($file_id, $post_id, $post_data = array()) {
- $overrides = array('test_form'=>false);
+function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
$time = current_time('mysql');
if ( $post = get_post($post_id) ) {
@@ -208,9 +226,9 @@
// use image exif/iptc data for title and caption defaults if possible
if ( $image_meta = @wp_read_image_metadata($file) ) {
- if ( trim($image_meta['title']) )
+ if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
$title = $image_meta['title'];
- if ( trim($image_meta['caption']) )
+ if ( trim( $image_meta['caption'] ) )
$content = $image_meta['caption'];
}
@@ -223,6 +241,10 @@
'post_content' => $content,
), $post_data );
+ // This should never be set as it would then overwrite an existing attachment.
+ if ( isset( $attachment['ID'] ) )
+ unset( $attachment['ID'] );
+
// Save the data
$id = wp_insert_attachment($attachment, $file, $post_id);
if ( !is_wp_error($id) ) {
@@ -234,15 +256,15 @@
}
/**
- * {@internal Missing Short Description}}
+ * This handles a sideloaded file in the same way as an uploaded file is handled by {@link media_handle_upload()}
*
- * @since unknown
+ * @since 2.6.0
*
- * @param unknown_type $file_array
- * @param unknown_type $post_id
- * @param unknown_type $desc
- * @param unknown_type $post_data
- * @return unknown
+ * @param array $file_array Array similar to a {@link $_FILES} upload array
+ * @param int $post_id The post ID the media is associated with
+ * @param string $desc Description of the sideloaded file
+ * @param array $post_data allows you to overwrite some of the attachment
+ * @return int|object The ID of the attachment or a WP_Error on failure
*/
function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
$overrides = array('test_form'=>false);
@@ -259,13 +281,14 @@
// use image exif/iptc data for title and caption defaults if possible
if ( $image_meta = @wp_read_image_metadata($file) ) {
- if ( trim($image_meta['title']) )
+ if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
$title = $image_meta['title'];
- if ( trim($image_meta['caption']) )
+ if ( trim( $image_meta['caption'] ) )
$content = $image_meta['caption'];
}
- $title = @$desc;
+ if ( isset( $desc ) )
+ $title = $desc;
// Construct the attachment array
$attachment = array_merge( array(
@@ -276,12 +299,15 @@
'post_content' => $content,
), $post_data );
+ // This should never be set as it would then overwrite an existing attachment.
+ if ( isset( $attachment['ID'] ) )
+ unset( $attachment['ID'] );
+
// Save the attachment metadata
$id = wp_insert_attachment($attachment, $file, $post_id);
- if ( !is_wp_error($id) ) {
+ if ( !is_wp_error($id) )
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
- return $url;
- }
+
return $id;
}
@@ -291,22 +317,20 @@
* Wrap iframe content (produced by $content_func) in a doctype, html head/body
* etc any additional function args will be passed to content_func.
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $content_func
*/
function wp_iframe($content_func /* ... */) {
+ _wp_admin_html_begin();
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title><?php bloginfo('name') ?> › <?php _e('Uploads'); ?> — <?php _e('WordPress'); ?></title>
<?php
-wp_enqueue_style( 'global' );
-wp_enqueue_style( 'wp-admin' );
+
wp_enqueue_style( 'colors' );
-if ( 0 === strpos( $content_func, 'media' ) )
+// Check callback name for 'media'
+if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
+ || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
wp_enqueue_style( 'media' );
wp_enqueue_style( 'ie' );
?>
@@ -314,7 +338,8 @@
//<![CDATA[
addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time(); ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup';
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+isRtl = <?php echo (int) is_rtl(); ?>;
//]]>
</script>
<?php
@@ -330,7 +355,10 @@
do_action( "admin_head_{$content_func}" );
?>
</head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="no-js">
+<script type="text/javascript">
+document.body.className = document.body.className.replace('no-js', 'js');
+</script>
<?php
$args = func_get_args();
$args = array_slice($args, 1);
@@ -347,36 +375,44 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*/
-function media_buttons() {
- global $post_ID, $temp_ID;
- $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
+function media_buttons($editor_id = 'content') {
$context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
- $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID";
- $media_title = __('Add Media');
- $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&type=image");
- $image_title = __('Add an Image');
- $video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&type=video");
- $video_title = __('Add Video');
- $audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&type=audio");
- $audio_title = __('Add Audio');
- $out = <<<EOF
- <a href="{$image_upload_iframe_src}&TB_iframe=true" id="add_image" class="thickbox" title='$image_title' onclick="return false;"><img src='images/media-button-image.gif' alt='$image_title' /></a>
- <a href="{$video_upload_iframe_src}&TB_iframe=true" id="add_video" class="thickbox" title='$video_title' onclick="return false;"><img src='images/media-button-video.gif' alt='$video_title' /></a>
- <a href="{$audio_upload_iframe_src}&TB_iframe=true" id="add_audio" class="thickbox" title='$audio_title' onclick="return false;"><img src='images/media-button-music.gif' alt='$audio_title' /></a>
- <a href="{$media_upload_iframe_src}&TB_iframe=true" id="add_media" class="thickbox" title='$media_title' onclick="return false;"><img src='images/media-button-other.gif' alt='$media_title' /></a>
+ $img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="15" height="15" />';
-EOF;
- printf($context, $out);
+ echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="' . esc_attr( $editor_id ) . '-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>';
}
add_action( 'media_buttons', 'media_buttons' );
+function _media_button($title, $icon, $type, $id) {
+ return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='{$id}-add_{$type}' class='thickbox add_$type' title='" . esc_attr( $title ) . "'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
+}
+
+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}}
*
- * @since unknown
+ * @since 2.5.0
*
* @return unknown
*/
@@ -392,6 +428,11 @@
if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
$post = $_post = get_post($attachment_id, ARRAY_A);
+ $post_type_object = get_post_type_object( $post[ 'post_type' ] );
+
+ if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) )
+ continue;
+
if ( isset($attachment['post_content']) )
$post['post_content'] = $attachment['post_content'];
if ( isset($attachment['post_title']) )
@@ -408,7 +449,7 @@
$post = apply_filters('attachment_fields_to_save', $post, $attachment);
- if ( isset($attachment['image_alt']) && !empty($attachment['image_alt']) ) {
+ if ( isset($attachment['image_alt']) ) {
$image_alt = get_post_meta($attachment_id, '_wp_attachment_image_alt', true);
if ( $image_alt != stripslashes($attachment['image_alt']) ) {
$image_alt = wp_strip_all_tags( stripslashes($attachment['image_alt']), true );
@@ -445,10 +486,11 @@
if ( isset($send_id) ) {
$attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
- $html = $attachment['post_title'];
+ $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
if ( !empty($attachment['url']) ) {
- if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) )
- $rel = " rel='attachment wp-att-" . esc_attr($send_id)."'";
+ $rel = '';
+ if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
+ $rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
$html = "<a href='{$attachment['url']}'$rel>$html</a>";
}
@@ -462,15 +504,16 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @return unknown
*/
-function media_upload_image() {
+function wp_media_upload_handler() {
$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);
@@ -481,123 +524,36 @@
}
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 ( !empty($src) )
- $html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
- $html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align);
- 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( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
+ $title = esc_html( stripslashes( $_POST['title'] ) );
+ if ( empty( $title ) )
+ $title = esc_html( basename( $src ) );
- 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 );
-}
+ if ( $title && $src )
+ $html = "<a href='" . esc_url($src) . "'>$title</a>";
-/**
- * {@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) ) {
- // 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;
+ $type = 'file';
+ if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
+ && ( 'audio' == $ext_type || 'video' == $ext_type ) )
+ $type = $ext_type;
- // If error storing temporarily, unlink
- if ( is_wp_error($tmp) ) {
- @unlink($file_array['tmp_name']);
- $file_array['tmp_name'] = '';
- }
-
- // do the validation and storage stuff
- $id = media_handle_sideload($file_array, $post_id, @$desc);
- $src = $id;
-
- // 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 = "<img src='$src' alt='$alt' />";
- return $html;
- }
-}
+ $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 = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
-/**
- * {@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']);
- unset($_FILES);
- if ( is_wp_error($id) ) {
- $errors['upload_error'] = $id;
- $id = false;
+ $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );
}
- }
-
- 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 = "<a href='" . esc_url($href) . "' >$title</a>";
-
- $html = apply_filters('audio_send_to_editor_url', $html, $href, $title);
return media_send_to_editor($html);
}
@@ -616,129 +572,66 @@
return media_upload_gallery();
}
- if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
- return wp_iframe( 'media_upload_type_url_form', 'audio', $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 );
+}
+
+/**
+ * Download an image from the specified URL and attach it to a post.
+ *
+ * @since 2.6.0
+ *
+ * @param string $file The URL of the image to download
+ * @param int $post_id The post ID the media is to be associated with
+ * @param string $desc Optional. Description of the image
+ * @return string|WP_Error Populated HTML img tag on success
+ */
+function media_sideload_image($file, $post_id, $desc = null) {
+ if ( ! empty($file) ) {
+ // Download file to temp location
+ $tmp = download_url( $file );
- return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
+ // 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;
+
+ // If error storing temporarily, unlink
+ if ( is_wp_error( $tmp ) ) {
+ @unlink($file_array['tmp_name']);
+ $file_array['tmp_name'] = '';
+ }
+
+ // do the validation and storage stuff
+ $id = media_handle_sideload( $file_array, $post_id, $desc );
+ // If error storing permanently, unlink
+ if ( is_wp_error($id) ) {
+ @unlink($file_array['tmp_name']);
+ return $id;
+ }
+
+ $src = wp_get_attachment_url( $id );
+ }
+
+ // Finally check to make sure the file has been saved, then return the html
+ if ( ! empty($src) ) {
+ $alt = isset($desc) ? esc_attr($desc) : '';
+ $html = "<img src='$src' alt='$alt' />";
+ return $html;
+ }
}
/**
* {@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']);
- 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 = "<a href='" . esc_url($href) . "' >$title</a>";
-
- $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 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']);
- 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 = "<a href='" . esc_url($href) . "' >$title</a>";
- $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}}
- *
- * @since unknown
+ * @since 2.5.0
*
* @return unknown
*/
@@ -761,7 +654,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @return unknown
*/
@@ -782,7 +675,7 @@
/**
* Retrieve HTML for the image alignment radio buttons with the specified one checked.
*
- * @since unknown
+ * @since 2.7.0
*
* @param unknown_type $post
* @param unknown_type $checked
@@ -810,16 +703,16 @@
/**
* Retrieve HTML for the size radio buttons with the specified one checked.
*
- * @since unknown
+ * @since 2.7.0
*
* @param unknown_type $post
- * @param unknown_type $checked
+ * @param unknown_type $check
* @return unknown
*/
function image_size_input_fields( $post, $check = '' ) {
// get a list of the actual pixel dimensions of each possible intermediate version of this image
- $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
+ $size_names = 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');
@@ -843,12 +736,12 @@
$checked = " checked='checked'";
}
- $html = "<div class='image-size-item'><input type='radio' " . ( $enabled ? '' : "disabled='disabled' " ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
+ $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
$html .= "<label for='{$css_id}'>$label</label>";
// only show the dimensions if that choice is available
if ( $enabled )
- $html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d × %d)"), $downsize[1], $downsize[2] ). "</label>";
+ $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). "</label>";
$html .= '</div>';
@@ -865,7 +758,7 @@
/**
* Retrieve HTML for the Link URL buttons with the default link type as specified.
*
- * @since unknown
+ * @since 2.7.0
*
* @param unknown_type $post
* @param unknown_type $url_type
@@ -887,16 +780,23 @@
return "
<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
- <button type='button' class='button urlnone' title=''>" . __('None') . "</button>
- <button type='button' class='button urlfile' title='" . esc_attr($file) . "'>" . __('File URL') . "</button>
- <button type='button' class='button urlpost' title='" . esc_attr($link) . "'>" . __('Post URL') . "</button>
+ <button type='button' class='button urlnone' data-link-url=''>" . __('None') . "</button>
+ <button type='button' class='button urlfile' data-link-url='" . esc_attr($file) . "'>" . __('File URL') . "</button>
+ <button type='button' class='button urlpost' data-link-url='" . esc_attr($link) . "'>" . __('Attachment Post URL') . "</button>
";
}
+function wp_caption_input_textarea($edit_post) {
+ // post data is already escaped
+ $name = "attachments[{$edit_post->ID}][post_excerpt]";
+
+ return '<textarea name="' . $name . '" id="' . $name . '">' . $edit_post->post_excerpt . '</textarea>';
+}
+
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $form_fields
* @param unknown_type $post
@@ -912,7 +812,7 @@
$form_fields['image_alt'] = array(
'value' => $alt,
- 'label' => __('Alternate text'),
+ 'label' => __('Alternate Text'),
'helps' => __('Alt text for the image, e.g. “The Mona Lisa”')
);
@@ -935,7 +835,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $form_fields
* @param unknown_type $post
@@ -946,6 +846,15 @@
return $form_fields;
}
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.8.0
+ *
+ * @param unknown_type $form_fields
+ * @param unknown_type $post
+ * @return unknown
+ */
function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
unset($form_fields['image_url']);
return $form_fields;
@@ -954,7 +863,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $post
* @param unknown_type $attachment
@@ -976,7 +885,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $html
* @param unknown_type $attachment_id
@@ -1003,7 +912,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $post
* @param unknown_type $errors
@@ -1027,7 +936,8 @@
'image_alt' => array(),
'post_excerpt' => array(
'label' => __('Caption'),
- 'value' => $edit_post->post_excerpt
+ 'input' => 'html',
+ 'html' => wp_caption_input_textarea($edit_post)
),
'post_content' => array(
'label' => __('Description'),
@@ -1055,6 +965,8 @@
foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
$t = (array) get_taxonomy($taxonomy);
+ if ( ! $t['public'] )
+ continue;
if ( empty($t['label']) )
$t['label'] = $taxonomy;
if ( empty($t['args']) )
@@ -1089,13 +1001,14 @@
* component. Will also create link for showing and hiding the form to modify
* the image attachment.
*
- * @since unknown
+ * @since 2.5.0
*
* @param int $post_id Optional. Post ID.
* @param array $errors Errors for attachment, if any.
* @return string
*/
function get_media_items( $post_id, $errors ) {
+ $attachments = array();
if ( $post_id ) {
$post = get_post($post_id);
if ( $post && $post->post_type == 'attachment' )
@@ -1113,7 +1026,7 @@
if ( $attachment->post_status == 'trash' )
continue;
if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
- $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>";
+ $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
}
return $output;
@@ -1122,7 +1035,7 @@
/**
* Retrieve HTML form for modifying the image attachment.
*
- * @since unknown
+ * @since 2.5.0
*
* @param int $attachment_id Attachment ID for modification.
* @param string|array $args Optional. Override defaults.
@@ -1131,76 +1044,80 @@
function get_media_item( $attachment_id, $args = null ) {
global $redir_tab;
- if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+ if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
$thumb_url = $thumb_url[0];
else
- return false;
+ $thumb_url = false;
- $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+ $post = get_post( $attachment_id );
+ $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
+
+ $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 );
- $toggle_on = __('Show');
- $toggle_off = __('Hide');
-
- $post = get_post($attachment_id);
+ $toggle_on = __( 'Show' );
+ $toggle_off = __( 'Hide' );
- $filename = basename($post->guid);
- $title = esc_attr($post->post_title);
+ $filename = esc_html( basename( $post->guid ) );
+ $title = esc_attr( $post->post_title );
- if ( $_tags = get_the_tags($attachment_id) ) {
+ if ( $_tags = get_the_tags( $attachment_id ) ) {
foreach ( $_tags as $tag )
$tags[] = $tag->name;
- $tags = esc_attr(join(', ', $tags));
+ $tags = esc_attr( join( ', ', $tags ) );
}
$post_mime_types = get_post_mime_types();
- $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
- $type = array_shift($keys);
+ $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
+ $type = array_shift( $keys );
$type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
- $form_fields = get_attachment_fields_to_edit($post, $errors);
+ $form_fields = get_attachment_fields_to_edit( $post, $errors );
if ( $toggle ) {
- $class = empty($errors) ? 'startclosed' : 'startopen';
+ $class = empty( $errors ) ? 'startclosed' : 'startopen';
$toggle_links = "
<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
<a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
} else {
- $class = 'form-table';
+ $class = '';
$toggle_links = '';
}
$display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
- $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt($display_title, 60) . "</span></div>" : '';
+ $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60 ) . "</span></div>" : '';
- $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false;
+ $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
$order = '';
foreach ( $form_fields as $key => $val ) {
if ( 'menu_order' == $key ) {
if ( $gallery )
- $order = '<div class="menu_order"> <input class="menu_order_input" type="text" id="attachments['.$attachment_id.'][menu_order]" name="attachments['.$attachment_id.'][menu_order]" value="'.$val['value'].'" /></div>';
+ $order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
else
- $order = '<input type="hidden" name="attachments['.$attachment_id.'][menu_order]" value="'.$val['value'].'" />';
+ $order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
- unset($form_fields['menu_order']);
+ unset( $form_fields['menu_order'] );
break;
}
}
$media_dims = '';
- $meta = wp_get_attachment_metadata($post->ID);
- if ( is_array($meta) && array_key_exists('width', $meta) && array_key_exists('height', $meta) )
- $media_dims .= "<span id='media-dims-{$post->ID}'>{$meta['width']} × {$meta['height']}</span> ";
- $media_dims = apply_filters('media_meta', $media_dims, $post);
+ $meta = wp_get_attachment_metadata( $post->ID );
+ if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
+ $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']} × {$meta['height']}</span> ";
+ $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 = "<input type='button' id='imgedit-open-btn-{$post->ID}' onclick='imageEdit.open($post->ID, \"$nonce\")' class='button' value='" . esc_attr__( 'Edit image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
+ if ( gd_edit_image_support( $post->post_mime_type ) ) {
+ $nonce = wp_create_nonce( "image_editor-$post->ID" );
+ $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
}
+ $attachment_url = get_permalink( $attachment_id );
+
$item = "
$type_html
$toggle_links
@@ -1208,18 +1125,21 @@
$display_title
<table class='slidetoggle describe $class'>
<thead class='media-item-info' id='media-head-$post->ID'>
- <tr>
- <td class='A1B1' id='thumbnail-head-$post->ID' rowspan='5'><img class='thumbnail' src='$thumb_url' alt='' /></td>
- <td><strong>" . __('File name:') . "</strong> $filename</td>
- </tr>
- <tr><td><strong>" . __('File type:') . "</strong> $post->post_mime_type</td></tr>
- <tr><td><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ) . "</td></tr>\n";
+ <tr valign='top'>
+ <td class='A1B1' id='thumbnail-head-$post->ID'>
+ <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
+ <p>$image_edit_button</p>
+ </td>
+ <td>
+ <p><strong>" . __('File name:') . "</strong> $filename</p>
+ <p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
+ <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
+ if ( !empty( $media_dims ) )
+ $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
- if ( !empty($media_dims) )
- $item .= "<tr><td><strong>" . __('Dimensions:') . "</strong> $media_dims</td></tr>\n";
+ $item .= "</td></tr>\n";
$item .= "
- <tr><td class='A1B1'>$image_edit_button</td></tr>
</thead>
<tbody>
<tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>
@@ -1233,14 +1153,19 @@
);
if ( $send )
- $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . esc_attr__( 'Insert into Post' ) . "' />";
- if ( $delete && current_user_can('delete_post', $attachment_id) ) {
+ $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+ if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
if ( !EMPTY_TRASH_DAYS ) {
- $delete = "<a href=\"" . wp_nonce_url("post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Delete Permanently') . "</a>";
+ $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
} elseif ( !MEDIA_TRASH ) {
- $delete = "<a href=\"#\" class=\"del-link\" onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __('Delete') . "</a> <div id=\"del_attachment_$attachment_id\" class=\"del-attachment\" style=\"display:none;\">" . sprintf(__("You are about to delete <strong>%s</strong>."), $filename) . " <a href=\"" . wp_nonce_url("post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"button\">" . __('Continue') . "</a> <a href=\"#\" class=\"button\" onclick=\"this.parentNode.style.display='none';return false;\">" . __('Cancel') . "</a></div>";
+ $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
+ <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
+ <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
+ <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
+ </div>";
} else {
- $delete = "<a href=\"" . wp_nonce_url("post.php?action=trash&post=$attachment_id", 'trash-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Move to Trash') . "</a> <a href=\"" . wp_nonce_url("post.php?action=untrash&post=$attachment_id", 'untrash-post_' . $attachment_id) . "\" id=\"undo[$attachment_id]\" class=\"undo hidden\">" . __('Undo') . "</a>";
+ $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
+ <a href='" . wp_nonce_url( "post.php?action=untrash&post=$attachment_id", 'untrash-attachment_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
}
} else {
$delete = '';
@@ -1249,27 +1174,30 @@
$thumbnail = '';
$calling_post_id = 0;
if ( isset( $_GET['post_id'] ) )
- $calling_post_id = $_GET['post_id'];
+ $calling_post_id = absint( $_GET['post_id'] );
elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set
$calling_post_id = $post->post_parent;
- if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id )
- $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\");return false;'>" . esc_html__( "Use as thumbnail" ) . "</a>";
+ 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 = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
+ }
- if ( ( $send || $thumbnail || $delete ) && !isset($form_fields['buttons']) )
- $form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $thumbnail $delete</td></tr>\n");
+ if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) )
+ $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $thumbnail $delete</td></tr>\n" );
$hidden_fields = array();
foreach ( $form_fields as $id => $field ) {
- if ( $id{0} == '_' )
+ if ( $id[0] == '_' )
continue;
- if ( !empty($field['tr']) ) {
+ if ( !empty( $field['tr'] ) ) {
$item .= $field['tr'];
continue;
}
- $field = array_merge($defaults, $field);
+ $field = array_merge( $defaults, $field );
$name = "attachments[$attachment_id][$id]";
if ( $field['input'] == 'hidden' ) {
@@ -1277,30 +1205,35 @@
continue;
}
- $required = $field['required'] ? '<abbr title="required" class="required">*</abbr>' : '';
+ $required = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
$aria_required = $field['required'] ? " aria-required='true' " : '';
$class = $id;
$class .= $field['required'] ? ' form-required' : '';
- $item .= "\t\t<tr class='$class'>\n\t\t\t<th valign='top' scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span><span class='alignright'>$required</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
- if ( !empty($field[$field['input']]) )
- $item .= $field[$field['input']];
+ $item .= "\t\t<tr class='$class'>\n\t\t\t<th valign='top' scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+ if ( !empty( $field[ $field['input'] ] ) )
+ $item .= $field[ $field['input'] ];
elseif ( $field['input'] == 'textarea' ) {
- $item .= "<textarea type='text' id='$name' name='$name'" . $aria_required . ">" . esc_html( $field['value'] ) . "</textarea>";
+ if ( 'post_content' == $id && user_can_richedit() ) {
+ // sanitize_post() skips the post_content when user_can_richedit
+ $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
+ }
+ // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit()
+ $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
} else {
- $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'" . $aria_required . "/>";
+ $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
}
- if ( !empty($field['helps']) )
- $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique((array) $field['helps']) ) . '</p>';
+ if ( !empty( $field['helps'] ) )
+ $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
$item .= "</td>\n\t\t</tr>\n";
$extra_rows = array();
- if ( !empty($field['errors']) )
- foreach ( array_unique((array) $field['errors']) as $error )
+ if ( !empty( $field['errors'] ) )
+ foreach ( array_unique( (array) $field['errors'] ) as $error )
$extra_rows['error'][] = $error;
- if ( !empty($field['extra_rows']) )
+ if ( !empty( $field['extra_rows'] ) )
foreach ( $field['extra_rows'] as $class => $rows )
foreach ( (array) $rows as $html )
$extra_rows[$class][] = $html;
@@ -1310,7 +1243,7 @@
$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
}
- if ( !empty($form_fields['_final']) )
+ if ( !empty( $form_fields['_final'] ) )
$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
$item .= "\t</tbody>\n";
$item .= "\t</table>\n";
@@ -1318,11 +1251,10 @@
foreach ( $hidden_fields as $name => $value )
$item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
- if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) {
+ if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
$parent = (int) $_REQUEST['post_id'];
$parent_name = "attachments[$attachment_id][post_parent]";
-
- $item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='" . $parent . "' />\n";
+ $item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='$parent' />\n";
}
return $item;
@@ -1331,7 +1263,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*/
function media_upload_header() {
?>
@@ -1345,145 +1277,162 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $errors
*/
function media_upload_form( $errors = null ) {
- global $type, $tab;
+ global $type, $tab, $pagenow, $is_IE, $is_opera;
+
+ if ( ! _device_can_upload() ) {
+ echo '<p>' . __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="http://wordpress.org/extend/mobile/">native app for your device</a> instead.') . '</p>';
+ return;
+ }
+
+ $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();
+ $sizes = array( 'KB', 'MB', 'GB' );
+
+ for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+ $upload_size_unit /= 1024;
+ }
- $flash_action_url = admin_url('async-upload.php');
+ if ( $u < 0 ) {
+ $upload_size_unit = 0;
+ $u = 0;
+ } else {
+ $upload_size_unit = (int) $upload_size_unit;
+ }
+?>
+
+<div id="media-upload-notice"><?php
+
+ if (isset($errors['upload_notice']) )
+ echo $errors['upload_notice'];
+
+?></div>
+<div id="media-upload-error"><?php
+
+ if (isset($errors['upload_error']) && is_wp_error($errors['upload_error']))
+ echo $errors['upload_error']->get_error_message();
- // If Mac and mod_security, no Flash. :(
- $flash = true;
- if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security') )
- $flash = false;
+?></div>
+<?php
+// Check quota for this blog if multisite
+if ( is_multisite() && !is_upload_space_available() ) {
+ echo '<p>' . sprintf( __( 'Sorry, you have filled your storage quota (%s MB).' ), get_space_allowed() ) . '</p>';
+ return;
+}
+
+do_action('pre-upload-ui');
+
+$post_params = array(
+ "post_id" => $post_id,
+ "_wpnonce" => wp_create_nonce('media-form'),
+ "type" => $_type,
+ "tab" => $_tab,
+ "short" => "1",
+);
- $flash = apply_filters('flash_uploader', $flash);
- $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
+$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 );
?>
+
<script type="text/javascript">
-//<![CDATA[
-var uploaderMode = 0;
-jQuery(document).ready(function($){
- uploaderMode = getUserSetting('uploader');
- $('.upload-html-bypass a').click(function(){deleteUserSetting('uploader');uploaderMode=0;swfuploadPreLoad();return false;});
- $('.upload-flash-bypass a').click(function(){setUserSetting('uploader', '1');uploaderMode=1;swfuploadPreLoad();return false;});
-});
-//]]>
+<?php
+// Verify size is an int. If not return default value.
+$large_size_h = absint( get_option('large_size_h') );
+if( !$large_size_h )
+ $large_size_h = 1024;
+$large_size_w = absint( get_option('large_size_w') );
+if( !$large_size_w )
+ $large_size_w = 1024;
+?>
+var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
</script>
-<div id="media-upload-notice">
-<?php if (isset($errors['upload_notice']) ) { ?>
- <?php echo $errors['upload_notice']; ?>
-<?php } ?>
+
+<div id="plupload-upload-ui" class="hide-if-no-js">
+<?php do_action('pre-plupload-upload-ui'); // hook change, old name: 'pre-flash-upload-ui' ?>
+<div id="drag-drop-area">
+ <div class="drag-drop-inside">
+ <p class="drag-drop-info"><?php _e('Drop files here'); ?></p>
+ <p><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
+ <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></p>
+ </div>
</div>
-<div id="media-upload-error">
-<?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
- <?php echo $errors['upload_error']->get_error_message(); ?>
-<?php } ?>
+<?php do_action('post-plupload-upload-ui'); // hook change, old name: 'post-flash-upload-ui' ?>
</div>
-<?php do_action('pre-upload-ui'); ?>
-
-<?php if ( $flash ) : ?>
-<script type="text/javascript">
-//<![CDATA[
-var swfu;
-SWFUpload.onload = function() {
- var settings = {
- button_text: '<span class="button"><?php _e('Select Files'); ?></span>',
- button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif; }',
- button_height: "24",
- button_width: "132",
- button_text_top_padding: 2,
- button_image_url: '<?php echo includes_url('images/upload.png'); ?>',
- button_placeholder_id: "flash-browse-button",
- upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
- flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",
- file_post_name: "async-upload",
- file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
- post_params : {
- "post_id" : "<?php echo $post_id; ?>",
- "auth_cookie" : "<?php if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else echo $_COOKIE[AUTH_COOKIE]; ?>",
- "logged_in_cookie": "<?php echo $_COOKIE[LOGGED_IN_COOKIE]; ?>",
- "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
- "type" : "<?php echo $type; ?>",
- "tab" : "<?php echo $tab; ?>",
- "short" : "1"
- },
- file_size_limit : "<?php echo wp_max_upload_size(); ?>b",
- file_dialog_start_handler : fileDialogStart,
- file_queued_handler : fileQueued,
- upload_start_handler : uploadStart,
- upload_progress_handler : uploadProgress,
- upload_error_handler : uploadError,
- upload_success_handler : uploadSuccess,
- upload_complete_handler : uploadComplete,
- file_queue_error_handler : fileQueueError,
- file_dialog_complete_handler : fileDialogComplete,
- swfupload_pre_load_handler: swfuploadPreLoad,
- swfupload_load_failed_handler: swfuploadLoadFailed,
- custom_settings : {
- degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
- swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
- },
- debug: false
- };
- swfu = new SWFUpload(settings);
-};
-//]]>
-</script>
-
-<div id="flash-upload-ui">
-<?php do_action('pre-flash-upload-ui'); ?>
-
- <div>
- <?php _e( 'Choose files to upload' ); ?>
- <div id="flash-browse-button"></div>
- <span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
- </div>
-<?php do_action('post-flash-upload-ui'); ?>
- <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
-</div>
-<?php endif; // $flash ?>
-
-<div id="html-upload-ui">
+<div id="html-upload-ui" class="hide-if-js">
<?php do_action('pre-html-upload-ui'); ?>
<p id="async-upload-wrap">
- <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
- <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php esc_attr_e('Upload'); ?>" /> <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
+ <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
+ <input type="file" name="async-upload" id="async-upload" />
+ <?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+ <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
</p>
<div class="clear"></div>
- <?php if ( is_lighttpd_before_150() ): ?>
- <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>
- <?php endif;?>
-<?php do_action('post-html-upload-ui', $flash); ?>
+<?php do_action('post-html-upload-ui'); ?>
</div>
-<?php do_action('post-upload-ui'); ?>
+
+<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>
<?php
+if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 ) { ?>
+ <span class="big-file-warning"><?php _e('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.'); ?></span>
+<?php }
+
+ do_action('post-upload-ui');
}
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $type
* @param unknown_type $errors
* @param unknown_type $id
*/
function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+
media_upload_header();
- $post_id = intval($_REQUEST['post_id']);
+ $post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+ $form_class = 'media-upload-form type-form validate';
+
+ if ( get_user_setting('uploader') )
+ $form_class .= ' html-uploader';
?>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
-<input type="submit" class="hidden" name="save" value="" />
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+<?php submit_button( '', 'hidden', 'save', false ); ?>
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
<?php wp_nonce_field('media-form'); ?>
@@ -1502,52 +1451,56 @@
});
//]]>
</script>
-<div id="media-items">
-<?php
+<div id="media-items"><?php
+
if ( $id ) {
if ( !is_wp_error($id) ) {
add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
echo get_media_items( $id, $errors );
} else {
- echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div>';
+ echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>';
exit;
}
}
-?>
-</div>
+?></div>
+
<p class="savebutton ml-submit">
-<input type="submit" class="button" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
+<?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
</p>
+</form>
<?php
}
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.7.0
*
* @param unknown_type $type
* @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';
?>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
<?php wp_nonce_field('media-form'); ?>
-<?php if ( is_callable($callback) ) { ?>
-
-<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
+<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>
<script type="text/javascript">
//<![CDATA[
@@ -1572,19 +1525,27 @@
alt = f.alt.value.replace(/'/g, ''').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
- if ( f.caption.value )
- caption = f.caption.value.replace(/'/g, ''').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
+ if ( f.caption.value ) {
+ caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+ caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+ return a.replace(/[\r\n\t]+/, ' ');
+ });
+
+ caption = caption.replace(/\s*\n\s*/g, '<br />');
+ }
<?php } ?>
cls = caption ? '' : ' class="'+t.align+'"';
html = '<img alt="'+alt+'" src="'+f.src.value+'"'+title+cls+' width="'+t.width+'" height="'+t.height+'" />';
- if ( f.url.value )
- html = '<a href="'+f.url.value+'">'+html+'</a>';
+ if ( f.url.value ) {
+ url = f.url.value.replace(/'/g, ''').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
+ html = '<a href="'+url+'">'+html+'</a>';
+ }
if ( caption )
- html = '[caption id="" align="'+t.align+'" width="'+t.width+'" caption="'+caption+'"]'+html+'[/caption]';
+ html = '[caption id="" align="'+t.align+'" width="'+t.width+'"]'+html+caption+'[/caption]';
var win = window.dialogArguments || opener || parent || top;
win.send_to_editor(html);
@@ -1598,7 +1559,7 @@
document.getElementById('go_button').style.color = '#bbb';
if ( ! document.forms[0].src.value )
document.getElementById('status_img').innerHTML = '*';
- else document.getElementById('status_img').innerHTML = '<img src="images/no.png" alt="" />';
+ else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
},
updateImageData : function() {
@@ -1607,42 +1568,50 @@
t.width = t.preloadImg.width;
t.height = t.preloadImg.height;
document.getElementById('go_button').style.color = '#333';
- document.getElementById('status_img').innerHTML = '<img src="images/yes.png" alt="" />';
+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/yes.png' ) ); ?>" alt="" />';
},
getImageData : function() {
+ if ( jQuery('table.describe').hasClass('not-image') )
+ return;
+
var t = addExtImage, src = document.forms[0].src.value;
if ( ! src ) {
t.resetImageData();
return false;
}
- document.getElementById('status_img').innerHTML = '<img src="images/wpspin_light.gif" alt="" />';
+
+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
t.preloadImg = new Image();
t.preloadImg.onload = t.updateImageData;
t.preloadImg.onerror = t.resetImageData;
t.preloadImg.src = src;
}
}
+
+jQuery(document).ready( function($) {
+ $('.media-types input').click( function() {
+ $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+ });
+});
+
//]]>
</script>
<div id="media-items">
<div class="media-item media-blank">
-<?php echo apply_filters($callback, call_user_func($callback)); ?>
+<?php echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); ?>
</div>
</div>
</form>
<?php
- } else {
- wp_die( __('Unknown action.') );
- }
}
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $errors
*/
@@ -1655,6 +1624,10 @@
$post_id = intval($_REQUEST['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);
+ $form_class = 'media-upload-form validate';
+
+ if ( get_user_setting('uploader') )
+ $form_class .= ' html-uploader';
?>
<script type="text/javascript">
@@ -1677,9 +1650,9 @@
<?php _e('Sort Order:'); ?>
<a href="#" id="asc"><?php _e('Ascending'); ?></a> |
<a href="#" id="desc"><?php _e('Descending'); ?></a> |
-<a href="#" id="clear"><?php echo _x('Clear', 'verb'); ?></a>
+<a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
</div>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
<?php wp_nonce_field('media-form'); ?>
<?php //media_upload_form( $errors ); ?>
<table class="widefat" cellspacing="0">
@@ -1695,7 +1668,7 @@
</div>
<p class="ml-submit">
-<input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
@@ -1729,7 +1702,7 @@
<select id="orderby" name="orderby">
<option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
<option value="title"><?php _e('Title'); ?></option>
- <option value="ID"><?php _e('Date/Time'); ?></option>
+ <option value="post_date"><?php _e('Date/Time'); ?></option>
<option value="rand"><?php _e('Random'); ?></option>
</select>
</td>
@@ -1758,22 +1731,23 @@
</th>
<td class="field">
<select id="columns" name="columns">
- <option value="2"><?php _e('2'); ?></option>
- <option value="3" selected="selected"><?php _e('3'); ?></option>
- <option value="4"><?php _e('4'); ?></option>
- <option value="5"><?php _e('5'); ?></option>
- <option value="6"><?php _e('6'); ?></option>
- <option value="7"><?php _e('7'); ?></option>
- <option value="8"><?php _e('8'); ?></option>
- <option value="9"><?php _e('9'); ?></option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3" selected="selected">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
</select>
</td>
</tr>
</tbody></table>
<p class="ml-submit">
-<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
-<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
</p>
</div>
</form>
@@ -1783,7 +1757,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.5.0
*
* @param unknown_type $errors
*/
@@ -1796,6 +1770,10 @@
$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);
+ $form_class = 'media-upload-form validate';
+
+ if ( get_user_setting('uploader') )
+ $form_class .= ' html-uploader';
$_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
if ( $_GET['paged'] < 1 )
@@ -1803,7 +1781,7 @@
$start = ( $_GET['paged'] - 1 ) * 10;
if ( $start < 1 )
$start = 0;
- add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) );
+ add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) );
list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
@@ -1814,11 +1792,12 @@
<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
+<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
<p id="media-search" class="search-box">
<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
- <input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
- <input type="submit" value="<?php esc_attr_e( 'Search Media' ); ?>" class="button" />
+ <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+ <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
</p>
<ul class="subsubsub">
@@ -1851,9 +1830,9 @@
if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
$class = ' class="current"';
- $type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
+ $type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
}
-echo implode(' | </li>', $type_links) . '</li>';
+echo implode(' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
unset($type_links);
?>
</ul>
@@ -1905,7 +1884,7 @@
</select>
<?php } ?>
-<input type="submit" id="post-query-submit" value="<?php echo esc_attr( __( 'Filter »' ) ); ?>" class="button-secondary" />
+<?php submit_button( __( 'Filter »' ), 'secondary', 'post-query-submit', false ); ?>
</div>
@@ -1913,7 +1892,7 @@
</div>
</form>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="library-form">
<?php wp_nonce_field('media-form'); ?>
<?php //media_upload_form( $errors ); ?>
@@ -1935,7 +1914,7 @@
<?php echo get_media_items(null, $errors); ?>
</div>
<p class="ml-submit">
-<input type="submit" class="button savebutton" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</p>
</form>
@@ -1945,19 +1924,18 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.7.0
*
* @return unknown
*/
-function type_url_form_image() {
-
+function wp_media_insert_url_form( $default_view = 'image' ) {
if ( !apply_filters( 'disable_captions', '' ) ) {
$caption = '
- <tr>
+ <tr class="image-only">
<th valign="top" scope="row" class="label">
<span class="alignleft"><label for="caption">' . __('Image Caption') . '</label></span>
</th>
- <td class="field"><input id="caption" name="caption" value="" type="text" /></td>
+ <td class="field"><textarea id="caption" name="caption"></textarea></td>
</tr>
';
} else {
@@ -1968,12 +1946,19 @@
if ( empty($default_align) )
$default_align = 'none';
+ if ( 'image' == $default_view ) {
+ $view = 'image-only';
+ $table_class = '';
+ } else {
+ $view = $table_class = 'not-image';
+ }
+
return '
- <h4 class="media-sub-title">' . __('Insert an image from another web site') . '</h4>
- <table class="describe"><tbody>
+ <p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
+ <table class="describe ' . $table_class . '"><tbody>
<tr>
<th valign="top" scope="row" class="label" style="width:130px;">
- <span class="alignleft"><label for="src">' . __('Image URL') . '</label></span>
+ <span class="alignleft"><label for="src">' . __('URL') . '</label></span>
<span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
</th>
<td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
@@ -1981,13 +1966,15 @@
<tr>
<th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="title">' . __('Image Title') . '</label></span>
+ <span class="alignleft"><label for="title">' . __('Title') . '</label></span>
<span class="alignright"><abbr title="required" class="required">*</abbr></span>
</th>
<td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
</tr>
- <tr>
+ <tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. “Ransom Demands (PDF)”') . '</p></td></tr>
+
+ <tr class="image-only">
<th valign="top" scope="row" class="label">
<span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
</th>
@@ -1995,7 +1982,7 @@
<p class="help">' . __('Alt text for the image, e.g. “The Mona Lisa”') . '</p></td>
</tr>
' . $caption . '
- <tr class="align">
+ <tr class="align image-only">
<th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
<td class="field">
<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
@@ -2009,7 +1996,7 @@
</td>
</tr>
- <tr>
+ <tr class="image-only">
<th valign="top" scope="row" class="label">
<span class="alignleft"><label for="url">' . __('Link Image To:') . '</label></span>
</th>
@@ -2019,200 +2006,115 @@
<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
<p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
</tr>
-
- <tr>
+ <tr class="image-only">
<td></td>
<td>
<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
</td>
</tr>
+ <tr class="not-image">
+ <td></td>
+ <td>
+ ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
+ </td>
+ </tr>
</tbody></table>
';
}
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_audio() {
+function _insert_into_post_button($type) {
+ if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') )
+ return '';
+
+ if ( 'image' == $type )
return '
- <table class="describe"><tbody>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[href]">' . __('Audio File URL') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr><td></td><td class="help">' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . '</td></tr>
<tr>
<td></td>
<td>
- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
+ <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
</td>
</tr>
- </tbody></table>
-';
-}
+ ';
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function type_url_form_video() {
return '
- <table class="describe"><tbody>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[href]">' . __('Video URL') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr><td></td><td class="help">' . __('Link text, e.g. “Lucy on YouTube“') . '</td></tr>
<tr>
<td></td>
<td>
- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
+ ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
</td>
</tr>
- </tbody></table>
-';
+ ';
}
/**
* {@internal Missing Short Description}}
*
- * @since unknown
- *
- * @return unknown
+ * @since 2.6.0
*/
-function type_url_form_file() {
- return '
- <table class="describe"><tbody>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[href]">' . __('URL') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr>
- <th valign="top" scope="row" class="label">
- <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
- </th>
- <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
- </tr>
- <tr><td></td><td class="help">' . __('Link text, e.g. “Ransom Demands (PDF)”') . '</td></tr>
- <tr>
- <td></td>
- <td>
- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
- </td>
- </tr>
- </tbody></table>
-';
+function media_upload_flash_bypass() {
+ ?>
+ <p class="upload-flash-bypass">
+ <?php _e('You are using the multi-file uploader. Problems? Try the <a href="#">browser uploader</a> instead.'); ?>
+ </p>
+ <?php
}
-
-/**
- * {@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');
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
/**
* {@internal Missing Short Description}}
*
- * @since unknown
- */
-function media_upload_flash_bypass() {
- echo '<p class="upload-flash-bypass">';
- printf( __('You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'), esc_url(add_query_arg('flash', 0)) );
- echo '</p>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
+ * @since 2.6.0
*/
-function media_upload_html_bypass($flash = true) {
- echo '<p class="upload-html-bypass">';
- _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 <a href="%s">Flash uploader</a> instead.'), esc_url(add_query_arg('flash', 1)) );
- }
- echo "</p>\n";
+function media_upload_html_bypass() {
+ ?>
+ <p class="upload-html-bypass hide-if-no-js">
+ <?php _e('You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
+ </p>
+ <?php
}
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
-add_action('post-flash-upload-ui', 'media_upload_flash_bypass');
-add_action('post-html-upload-ui', 'media_upload_html_bypass');
+function media_upload_text_after() {
+ ?>
+ <span class="after-file-upload"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></span>
+ <?php
+}
+add_action('post-upload-ui', 'media_upload_text_after', 5);
/**
* {@internal Missing Short Description}}
*
- * Make sure the GET parameter sticks when we submit a form.
- *
- * @since unknown
- *
- * @param unknown_type $url
- * @return unknown
+ * @since 2.6.0
*/
-function media_upload_bypass_url($url) {
- if ( array_key_exists('flash', $_REQUEST) )
- $url = add_query_arg('flash', intval($_REQUEST['flash']));
- return $url;
+function media_upload_max_image_resize() {
+ $checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
+ $a = $end = '';
+
+ if ( current_user_can( 'manage_options' ) ) {
+ $a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
+ $end = '</a>';
+ }
+?>
+<p class="hide-if-no-js"><label>
+<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
+<?php
+ /* translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, %4$d is height*/
+ printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d × %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+?>
+</label></p>
+<?php
}
-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);
-add_filter('async_upload_file', 'get_media_item', 10, 2);
+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', '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( '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');
-
+add_filter( 'media_upload_gallery', 'media_upload_gallery' );
+add_filter( 'media_upload_library', 'media_upload_library' );