enmi-conf.org: comparison wp/wp-admin/upload.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 */
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( !current_user_can('upload_files') )
+if ( ! current_user_can( 'upload_files' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+}
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
+$mode  = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
 if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
 	$mode = $_GET['mode'];
 	update_user_option( get_current_user_id(), 'media_library_mode', $mode );
 	remove_action( 'admin_head', 'wp_admin_canonical_url' );
 	$q = $_GET;
 	// let JS handle this
 	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
+	$vars   = wp_edit_attachments_query_vars( $q );
 	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
 	foreach ( $vars as $key => $value ) {
 		if ( ! $value || in_array( $key, $ignore ) ) {
 			unset( $vars[ $key ] );
 		}
 	}
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
+	wp_localize_script(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
+		'media-grid',
-		'queryVars' => (object) $vars
+		'_wpMediaGridSettings',
-	) );
+		array(
+			'adminUrl'  => parse_url( self_admin_url(), PHP_URL_PATH ),
-	get_current_screen()->add_help_tab( array(
+			'queryVars' => (object) $vars,
-		'id'		=> 'overview',
+		)
-		'title'		=> __( 'Overview' ),
+	);
-		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
+	get_current_screen()->add_help_tab(
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
+		array(
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
+			'id'      => 'overview',
-	) );
+			'title'   => __( 'Overview' ),
+			'content' =>
-	get_current_screen()->add_help_tab( array(
+				'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-		'id'		=> 'attachment-details',
+				'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-		'title'		=> __( 'Attachment Details' ),
+				'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>',
-		'content'	=>
+		)
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
+	);
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
+	get_current_screen()->add_help_tab(
-	) );
+		array(
+			'id'      => 'attachment-details',
+			'title'   => __( 'Attachment Details' ),
+			'content' =>
+				'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
+				'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
+				'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>',
+		)
+	);
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 		'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen">Documentation on Media Library</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 	);
-	$title = __('Media Library');
+	$title       = __( 'Media Library' );
 	$parent_file = 'upload.php';
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
-	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
+	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query(); ?>">
 		<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
 		<?php
-		if ( current_user_can( 'upload_files' ) ) { ?>
+		if ( current_user_can( 'upload_files' ) ) {
-			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action aria-button-if-js"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+			?>
+			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action aria-button-if-js"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
+								<?php
 		}
 		?>
 		<hr class="wp-header-end">
 		<div class="error hide-if-js">
-			<p><?php printf(
+			<p>
+			<?php
+			printf(
 				/* translators: %s: list view URL */
 				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
 				'upload.php?mode=list'
-			); ?></p>
+			);
+			?>
+			</p>
 		</div>
 	</div>
 	<?php
 	include( ABSPATH . 'wp-admin/admin-footer.php' );
 	exit;
 }
-$wp_list_table = _get_list_table('WP_Media_List_Table');
+$wp_list_table = _get_list_table( 'WP_Media_List_Table' );
-$pagenum = $wp_list_table->get_pagenum();
+$pagenum       = $wp_list_table->get_pagenum();
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 if ( $doaction ) {
-	check_admin_referer('bulk-media');
+	check_admin_referer( 'bulk-media' );
 	if ( 'delete_all' == $doaction ) {
 		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
 		$doaction = 'delete';
 	} elseif ( isset( $_REQUEST['media'] ) ) {
 		$post_ids = explode( ',', $_REQUEST['ids'] );
 	}
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
 			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 	switch ( $doaction ) {
 		case 'detach':
 			wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
 		case 'attach':
 			wp_media_attach_action( $_REQUEST['found_post_id'] );
 			break;
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
 					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				}
-				if ( !wp_trash_post( $post_id ) )
+				if ( ! wp_trash_post( $post_id ) ) {
 					wp_die( __( 'Error in moving to Trash.' ) );
-			}
+				}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			}
+			$location = add_query_arg(
+				array(
+					'trashed' => count( $post_ids ),
+					'ids'     => join( ',', $post_ids ),
+				),
+				$location
+			);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
 					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				}
-				if ( !wp_untrash_post( $post_id ) )
+				if ( ! wp_untrash_post( $post_id ) ) {
 					wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
+				if ( ! current_user_can( 'delete_post', $post_id_del ) ) {
 					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+				}
-				if ( !wp_delete_attachment( $post_id_del ) )
+				if ( ! wp_delete_attachment( $post_id_del ) ) {
 					wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;
 		default:
 			/** This action is documented in wp-admin/edit-comments.php */
 	}
 	wp_redirect( $location );
 	exit;
 } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+	wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-	 exit;
+	exit;
 }
 $wp_list_table->prepare_items();
-$title = __('Media Library');
+$title       = __( 'Media Library' );
 $parent_file = 'upload.php';
 wp_enqueue_script( 'media' );
 add_screen_option( 'per_page' );
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(
-'id'		=> 'overview',
+	array(
-'title'		=> __('Overview'),
+		'id'      => 'overview',
-'content'	=>
+		'title'   => __( 'Overview' ),
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
+		'content' =>
-	'<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
+				 '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
+				 '<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
-) );
+				 '<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>',
-get_current_screen()->add_help_tab( array(
+	)
-'id'		=> 'actions-links',
+);
-'title'		=> __('Available Actions'),
+get_current_screen()->add_help_tab(
-'content'	=>
+	array(
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
+		'id'      => 'actions-links',
-) );
+		'title'   => __( 'Available Actions' ),
-get_current_screen()->add_help_tab( array(
+		'content' =>
-'id'		=> 'attaching-files',
+				 '<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>',
-'title'		=> __('Attaching Files'),
+	)
-'content'	=>
+);
-	'<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
+get_current_screen()->add_help_tab(
-) );
+	array(
+		'id'      => 'attaching-files',
+		'title'   => __( 'Attaching Files' ),
+		'content' =>
+				 '<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>',
+	)
+);
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen">Documentation on Media Library</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(
-	'heading_views'      => __( 'Filter media items list' ),
+	array(
-	'heading_pagination' => __( 'Media items list navigation' ),
+		'heading_views'      => __( 'Filter media items list' ),
-	'heading_list'       => __( 'Media items list' ),
+		'heading_pagination' => __( 'Media items list navigation' ),
-) );
+		'heading_list'       => __( 'Media items list' ),
+	)
+);
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
 <?php
-if ( current_user_can( 'upload_files' ) ) { ?>
+if ( current_user_can( 'upload_files' ) ) {
-	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+	?>
+	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
+						<?php
 }
 if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 	/* translators: %s: search keywords */
 	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
 <hr class="wp-header-end">
 <?php
 $message = '';
 if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media file updated.' );
+	$message                = __( 'Media file updated.' );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
 }
 if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
 	if ( 1 == $attached ) {
 		$message = __( 'Media file attached.' );
 	} else {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
 	}
-	$message = sprintf( $message, number_format_i18n( $attached ) );
+	$message                = sprintf( $message, number_format_i18n( $attached ) );
 	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
 	if ( 1 == $detached ) {
 		$message = __( 'Media file detached.' );
 	} else {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
 	}
-	$message = sprintf( $message, number_format_i18n( $detached ) );
+	$message                = sprintf( $message, number_format_i18n( $detached ) );
 	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
 	if ( 1 == $deleted ) {
 		$message = __( 'Media file permanently deleted.' );
 	} else {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
+	$message                = sprintf( $message, number_format_i18n( $deleted ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
 }
 if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
 	if ( 1 == $trashed ) {
 		$message = __( 'Media file moved to the trash.' );
 	} else {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
+	$message                = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
+	$message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
 }
 if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
 	if ( 1 == $untrashed ) {
 		$message = __( 'Media file restored from the trash.' );
 	} else {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
+	$message                = sprintf( $message, number_format_i18n( $untrashed ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
 }
 $messages[1] = __( 'Media file updated.' );
 $messages[2] = __( 'Media file permanently deleted.' );
 $messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
+$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
 $messages[5] = __( 'Media file restored from the trash.' );
 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
+	$message                = $messages[ $_GET['message'] ];
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
 }
-if ( !empty($message) ) { ?>
+if ( ! empty( $message ) ) {
+	?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 <form id="posts-filter" method="get">

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4