X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/media-upload.php diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php index ccb364e0..6246176b 100644 --- a/wp-admin/media-upload.php +++ b/wp-admin/media-upload.php @@ -9,14 +9,20 @@ * @subpackage Administration */ +if ( ! isset( $_GET['inline'] ) ) + define( 'IFRAME_REQUEST' , true ); + /** Load WordPress Administration Bootstrap */ -require_once('admin.php'); +require_once('./admin.php'); if (!current_user_can('upload_files')) wp_die(__('You do not have permission to upload files.')); -wp_enqueue_script('swfupload-all'); -wp_enqueue_script('swfupload-handlers'); +wp_enqueue_script('plupload-handlers'); +wp_enqueue_script('image-edit'); +wp_enqueue_script('set-post-thumbnail' ); +wp_enqueue_style('imgareaselect'); +wp_enqueue_script( 'media-gallery' ); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @@ -26,21 +32,16 @@ $post_id = isset($post_id)? (int) $post_id : 0; // Require an ID for the edit screen if ( isset($action) && $action == 'edit' && !$ID ) - wp_die(__("You are not allowed to be here")); + wp_die( __( 'Cheatin’ uh?' ) ); if ( isset($_GET['inline']) ) { + $errors = array(); - if ( isset($_GET['upload-page-form']) ) { - $errors = media_upload_form_handler(); - - $location = 'upload.php'; - if ( $errors ) - $location .= '?message=3'; - - wp_redirect( admin_url($location) ); - } + 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); @@ -50,14 +51,52 @@ if ( isset($_GET['inline']) ) { } } + 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'; - require_once('admin-header.php'); ?> + get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => + '
' . __('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:') . '
' . + '' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '
' + ) ); + get_current_screen()->set_help_sidebar( + '' . __('For more information:') . '
' . + '' . __('Documentation on Uploading Media Files') . '
' . + '' . __('Support Forums') . '
' + ); + + require_once('./admin-header.php'); + + $form_class = 'media-upload-form type-form validate'; + + if ( get_user_setting('uploader') ) + $form_class .= ' html-uploader'; + ?>