WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / media-upload.php

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index b33b0d51c48dcbe51e3fc5a4e30f6aad757bfcc5..6246176b88399343f469276f4e8242223526f74d 100644 (file)
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -18,11 +18,11 @@ require_once('./admin.php');
 if (!current_user_can('upload_files'))
        wp_die(__('You do not have permission to upload files.'));
 
 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('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'));
 
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 


@@ -32,11 +32,14 @@ $post_id = isset($post_id)? (int) $post_id : 0;
 
 // Require an ID for the edit screen
 if ( isset($action) && $action == 'edit' && !$ID )
 
 // 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['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
        if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                check_admin_referer('media-form');
                // Upload File button was clicked


@@ -59,23 +62,41 @@ if ( isset($_GET['inline']) ) {
                exit;
        }
 
                exit;
        }
 

+       if ( isset( $_REQUEST['post_id'] ) )
+               wp_die( __( 'Cheatin’ uh?' ) );
+

        $title = __('Upload New Media');
        $parent_file = 'upload.php';
        $title = __('Upload New Media');
        $parent_file = 'upload.php';

-
-       add_contextual_help( $current_screen,
-'<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.') . '</p>' .
-               '<p>' . __('There are two options for uploading files: <em>Select Files</em> will open the Flash-based uploader (multiple file upload allowed), or you can use the <em>Browser Uploader</em>. Clicking <em>Select Files</em> opens a navigation window showing you files in your operating system. Selecting <em>Open</em> after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click <em>Save</em> before leaving this screen.') . '</p>' .
+       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>'
        );
 
                '<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'); ?>
+       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>
 
        <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="media-upload-form type-form validate" id="file-form">
+       <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(); ?>
 
 
        <?php media_upload_form(); ?>
 


@@ -92,8 +113,8 @@ if ( isset($_GET['inline']) ) {
        </script>
        <input type="hidden" name="post_id" id="post_id" value="0" />
        <?php wp_nonce_field('media-form'); ?>
        </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 hide-if-no-js', 'save' ); ?>
+       <div id="media-items" class="hide-if-no-js"></div>
+       <?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>

        </form>
        </div>
 
        </form>
        </div>
 


@@ -101,6 +122,8 @@ if ( isset($_GET['inline']) ) {
        include('./admin-footer.php');
 
 } else {
        include('./admin-footer.php');
 
 } 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']) )
 
        // upload type: image, video, file, ..?
        if ( isset($_GET['type']) )


@@ -117,9 +140,8 @@ if ( isset($_GET['inline']) ) {
        $body_id = 'media-upload';
 
        // let the action code decide how to handle the request
        $body_id = 'media-upload';
 
        // let the action code decide how to handle the request

-       if ( $tab == 'type' || $tab == 'type_url' )
+       if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) )

                do_action("media_upload_$type");
        else
                do_action("media_upload_$tab");
 }
                do_action("media_upload_$type");
        else
                do_action("media_upload_$tab");
 }

-?>