X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/80b7979fccf09a75af3f4c111fa27060ae6dbf85..5e031ad59895b5682d1509675cafe9f2c5081c12:/wp-admin/media-upload.php?ds=sidebyside

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 6246176b..2792b25f 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -13,7 +13,7 @@ if ( ! isset( $_GET['inline'] ) )
 	define( 'IFRAME_REQUEST' , true );
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
@@ -30,118 +30,74 @@ wp_enqueue_script( 'media-gallery' );
 $ID = isset($ID) ? (int) $ID : 0;
 $post_id = isset($post_id)? (int) $post_id : 0;
 
-// Require an ID for the edit screen
-if ( isset($action) && $action == 'edit' && !$ID )
-	wp_die( __( 'Cheatin’ uh?' ) );
-
-if ( isset($_GET['inline']) ) {
-	$errors = array();
-
-	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin’ uh?' ) );
-
-	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 ( isset($_GET['upload-page-form']) ) {
-		$errors = array_merge($errors, (array) media_upload_form_handler());
-
-		$location = 'upload.php';
-		if ( $errors )
-			$location .= '?message=3';
-
-		wp_redirect( admin_url($location) );
-		exit;
-	}
-
-	if ( isset( $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin’ uh?' ) );
-
-	$title = __('Upload New Media');
-	$parent_file = 'upload.php';
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-			'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-			'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
-		'</ul>' .
-		'<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
-	) );
-	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
-		'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-
-	require_once('./admin-header.php');
-
-	$form_class = 'media-upload-form type-form validate';
-
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
-	?>
-	<div class="wrap">
-	<?php screen_icon(); ?>
-	<h2><?php echo esc_html( $title ); ?></h2>
-
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
-
-	<?php media_upload_form(); ?>
-
-	<script type="text/javascript">
-	jQuery(function($){
-		var preloaded = $(".media-item.preloaded");
-		if ( preloaded.length > 0 ) {
-			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		}
-		updateMediaForm();
-		post_id = 0;
-		shortform = 1;
-	});
-	</script>
-	<input type="hidden" name="post_id" id="post_id" value="0" />
-	<?php wp_nonce_field('media-form'); ?>
-	<div id="media-items" class="hide-if-no-js"></div>
-	<?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
-	</form>
-	</div>
+// Require an ID for the edit screen.
+if ( isset($action) && $action == 'edit' && !$ID ) {
+	wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+}
 
-<?php
-	include('./admin-footer.php');
+if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+	wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+}
 
+// Upload type: image, video, file, ..?
+if ( isset($_GET['type']) ) {
+	$type = strval($_GET['type']);
 } else {
-	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-	// upload type: image, video, file, ..?
-	if ( isset($_GET['type']) )
-		$type = strval($_GET['type']);
-	else
-		$type = apply_filters('media_upload_default_type', 'file');
-
-	// tab: gallery, library, or type-specific
-	if ( isset($_GET['tab']) )
-		$tab = strval($_GET['tab']);
-	else
-		$tab = apply_filters('media_upload_default_tab', 'type');
+	/**
+	 * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $type The default media upload type. Possible values include
+	 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
+	 */
+	$type = apply_filters( 'media_upload_default_type', 'file' );
+}
 
-	$body_id = 'media-upload';
+// Tab: gallery, library, or type-specific.
+if ( isset($_GET['tab']) ) {
+	$tab = strval($_GET['tab']);
+} else {
+	/**
+	 * Filter the default tab in the legacy (pre-3.5.0) media popup.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $type The default media popup tab. Default 'type' (From Computer).
+	 */
+	$tab = apply_filters( 'media_upload_default_tab', 'type' );
+}
 
-	// let the action code decide how to handle the request
-	if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) )
-		do_action("media_upload_$type");
-	else
-		do_action("media_upload_$tab");
+$body_id = 'media-upload';
+
+// Let the action code decide how to handle the request.
+if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+	/**
+	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
+	 * media popup based on the current tab.
+	 *
+	 * The dynamic portion of the hook name, `$type`, refers to the specific
+	 * media upload type. Possible values include 'image', 'audio', 'video',
+	 * 'file', etc.
+	 *
+	 * The hook only fires if the current `$tab` is 'type' (From Computer),
+	 * 'type_url' (From URL), or, if the tab does not exist (i.e., has not
+	 * been registered via the {@see 'media_upload_tabs'} filter.
+	 *
+	 * @since 2.5.0
+	 */
+	do_action( "media_upload_$type" );
+} else {
+	/**
+	 * Fires inside limited and specific upload-tab views in the legacy
+	 * (pre-3.5.0) media popup.
+	 *
+	 * The dynamic portion of the hook name, `$tab`, refers to the specific
+	 * media upload tab. Possible values include 'library' (Media Library),
+	 * or any custom tab registered via the {@see 'media_upload_tabs'} filter.
+	 *
+	 * @since 2.5.0
+	 */
+	do_action( "media_upload_$tab" );
 }
+