WordPress 3.4
[autoinstalls/wordpress.git] / wp-admin / custom-header.php
index ebeb2a5ad7815a4713608c113824cad0e1c4fc5b..fc9d4f126f10894ea7e8b1edd341857a50138cb9 100644 (file)
@@ -42,7 +42,6 @@ class Custom_Image_Header {
         */
        var $default_headers = array();
 
-
        /**
         * Holds custom headers uploaded by the user
         *
@@ -72,6 +71,8 @@ class Custom_Image_Header {
        function __construct($admin_header_callback, $admin_image_div_callback = '') {
                $this->admin_header_callback = $admin_header_callback;
                $this->admin_image_div_callback = $admin_image_div_callback;
+
+               add_action( 'admin_menu', array( $this, 'init' ) );
        }
 
        /**
@@ -90,7 +91,14 @@ class Custom_Image_Header {
                add_action("admin_head-$page", array(&$this, 'help') );
                add_action("admin_head-$page", array(&$this, 'take_action'), 50);
                add_action("admin_head-$page", array(&$this, 'js'), 50);
-               add_action("admin_head-$page", $this->admin_header_callback, 51);
+               if ( $this->admin_header_callback )
+                       add_action("admin_head-$page", $this->admin_header_callback, 51);
+
+               if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-header' ) {
+                       add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
+                       add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
+                       add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
+               }
        }
 
        /**
@@ -103,9 +111,27 @@ class Custom_Image_Header {
                        'id'      => 'overview',
                        'title'   => __('Overview'),
                        'content' =>
-                               '<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately.' ) . '</p>' .
-                               '<p>' . __( 'If you want to discard your custom header and go back to the default included in your theme, click on the buttons to remove the custom image and restore the original header image.' ) . '</p>' .
-                               '<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the Save Changes button.' ) . '</p>'
+                               '<p>' . __( 'This screen is used to customize the header section of your theme.') . '</p>' .
+                               '<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
+               ) );
+
+               get_current_screen()->add_help_tab( array(
+                       'id'      => 'set-header-image',
+                       'title'   => __('Header Image'),
+                       'content' =>
+                               '<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
+                               '<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
+                               '<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
+                               '<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
+               ) );
+
+               get_current_screen()->add_help_tab( array(
+                       'id'      => 'set-header-text',
+                       'title'   => __('Header Text'),
+                       'content' =>
+                               '<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
+                               '<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by typing in a legitimate HTML hex value (eg: &#8220;#ff0000&#8221; for red) or by clicking &#8220;Select a Color&#8221; and dialing in a color using the color picker.') . '</p>' .
+                               '<p>' . __( 'Don&#8217;t forget to Save Changes when you&#8217;re done!') . '</p>'
                ) );
 
                get_current_screen()->set_help_sidebar(
@@ -127,8 +153,11 @@ class Custom_Image_Header {
                        return 1;
 
                $step = (int) $_GET['step'];
-               if ( $step < 1 || 3 < $step )
-                       $step = 1;
+               if ( $step < 1 || 3 < $step ||
+                       ( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
+                       ( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
+               )
+                       return 1;
 
                return $step;
        }
@@ -141,10 +170,15 @@ class Custom_Image_Header {
        function js_includes() {
                $step = $this->step();
 
-               if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
-                       wp_enqueue_script('farbtastic');
-               elseif ( 2 == $step )
+               if ( ( 1 == $step || 3 == $step ) ) {
+                       add_thickbox();
+                       wp_enqueue_script( 'media-upload' );
+                       wp_enqueue_script( 'custom-header' );
+                       if ( current_theme_supports( 'custom-header', 'header-text' ) )
+                               wp_enqueue_script('farbtastic');
+               } elseif ( 2 == $step ) {
                        wp_enqueue_script('imgareaselect');
+               }
        }
 
        /**
@@ -155,24 +189,12 @@ class Custom_Image_Header {
        function css_includes() {
                $step = $this->step();
 
-               if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
+               if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
                        wp_enqueue_style('farbtastic');
                elseif ( 2 == $step )
                        wp_enqueue_style('imgareaselect');
        }
 
-       /**
-        * Check if header text is allowed
-        *
-        * @since 3.0.0
-        */
-       function header_text() {
-               if ( defined( 'NO_HEADER_TEXT' ) && NO_HEADER_TEXT )
-                       return false;
-
-               return true;
-       }
-
        /**
         * Execute custom header modification.
         *
@@ -189,7 +211,7 @@ class Custom_Image_Header {
 
                if ( isset( $_POST['resetheader'] ) ) {
                        check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                       remove_theme_mod( 'header_image' );
+                       $this->reset_header_image();
                        return;
                }
 
@@ -201,36 +223,27 @@ class Custom_Image_Header {
 
                if ( isset( $_POST['removeheader'] ) ) {
                        check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                       set_theme_mod( 'header_image', 'remove-header' );
+                       $this->remove_header_image();
                        return;
                }
 
-               if ( isset( $_POST['text-color'] ) ) {
+               if ( isset( $_POST['text-color'] ) && ! isset( $_POST['display-header-text'] ) ) {
+                       check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+                       set_theme_mod( 'header_textcolor', 'blank' );
+               } elseif ( isset( $_POST['text-color'] ) ) {
                        check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
                        $_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
-                       if ( 'blank' == $_POST['text-color'] ) {
+                       $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
+                       if ( strlen($color) == 6 || strlen($color) == 3 )
+                               set_theme_mod('header_textcolor', $color);
+                       elseif ( ! $color )
                                set_theme_mod( 'header_textcolor', 'blank' );
-                       } else {
-                               $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-                               if ( strlen($color) == 6 || strlen($color) == 3 )
-                                       set_theme_mod('header_textcolor', $color);
-                       }
                }
 
                if ( isset( $_POST['default-header'] ) ) {
                        check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                       if ( 'random-default-image' == $_POST['default-header'] ) {
-                               set_theme_mod( 'header_image', 'random-default-image' );
-                       } elseif ( 'random-uploaded-image' == $_POST['default-header'] ) {
-                               set_theme_mod( 'header_image', 'random-uploaded-image' );
-                       } else {
-                               $this->process_default_headers();
-                               $uploaded = get_uploaded_header_images();
-                               if ( isset( $uploaded[$_POST['default-header']] ) )
-                                       set_theme_mod( 'header_image', esc_url( $uploaded[$_POST['default-header']]['url'] ) );
-                               elseif ( isset( $this->default_headers[$_POST['default-header']] ) )
-                                       set_theme_mod( 'header_image', esc_url( $this->default_headers[$_POST['default-header']]['url'] ) );
-                       }
+                       $this->set_header_image( $_POST['default-header'] );
+                       return;
                }
        }
 
@@ -290,9 +303,9 @@ class Custom_Image_Header {
                        echo '<div class="default-header">';
                        echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
                        $width = '';
-                       if ( !empty( $header['uploaded'] ) )
+                       if ( !empty( $header['attachment_id'] ) )
                                $width = ' width="230"';
-                       echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
+                       echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
                        echo '</div>';
                }
                echo '<div class="clear"></div></div>';
@@ -305,7 +318,7 @@ class Custom_Image_Header {
         */
        function js() {
                $step = $this->step();
-               if ( ( 1 == $step || 3 == $step ) && $this->header_text() )
+               if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
                        $this->js_1();
                elseif ( 2 == $step )
                        $this->js_2();
@@ -319,86 +332,75 @@ class Custom_Image_Header {
        function js_1() { ?>
 <script type="text/javascript">
 /* <![CDATA[ */
-       var text_objects = ['#name', '#desc', '#text-color-row'];
-       var farbtastic;
-       var default_color = '#<?php echo HEADER_TEXTCOLOR; ?>';
-       var old_color = null;
+var farbtastic;
+(function($){
+       var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
+               header_text_fields;
 
        function pickColor(color) {
-               jQuery('#name').css('color', color);
-               jQuery('#desc').css('color', color);
-               jQuery('#text-color').val(color);
+               $('#name').css('color', color);
+               $('#desc').css('color', color);
+               $('#text-color').val(color);
                farbtastic.setColor(color);
        }
 
-       function toggle_text(s) {
-               if (jQuery(s).attr('id') == 'showtext' && jQuery('#text-color').val() != 'blank')
-                       return;
-
-               if (jQuery(s).attr('id') == 'hidetext' && jQuery('#text-color').val() == 'blank')
+       function toggle_text() {
+               var checked = $('#display-header-text').prop('checked'),
+                       text_color;
+               header_text_fields.toggle( checked );
+               if ( ! checked )
                        return;
-
-               if (jQuery('#text-color').val() == 'blank') {
-                       //Show text
-                       if (old_color == '#blank')
-                               old_color = default_color;
-
-                       jQuery( text_objects.toString() ).show();
-                       jQuery('#text-color').val(old_color);
-                       jQuery('#name').css('color', old_color);
-                       jQuery('#desc').css('color', old_color);
-                       pickColor(old_color);
+               text_color = $('#text-color');
+               if ( '' == text_color.val().replace('#', '') ) {
+                       text_color.val( default_color );
+                       pickColor( default_color );
                } else {
-                       //Hide text
-                       jQuery( text_objects.toString() ).hide();
-                       old_color = jQuery('#text-color').val();
-                       jQuery('#text-color').val('blank');
+                       pickColor( text_color.val() );
                }
        }
 
-       jQuery(document).ready(function() {
-               jQuery('#pickcolor').click(function() {
-                       jQuery('#color-picker').show();
+       $(document).ready(function() {
+               header_text_fields = $('.displaying-header-text');
+               $('#pickcolor').click(function(e) {
+                       e.preventDefault();
+                       $('#color-picker').show();
                });
 
-               jQuery('input[name="hidetext"]').click(function() {
-                       toggle_text(this);
-               });
+               $('#display-header-text').click( toggle_text );
 
-               jQuery('#defaultcolor').click(function() {
+               $('#defaultcolor').click(function() {
                        pickColor(default_color);
-                       jQuery('#text-color').val(default_color)
+                       $('#text-color').val(default_color);
                });
 
-               jQuery('#text-color').keyup(function() {
-                       var _hex = jQuery('#text-color').val();
+               $('#text-color').keyup(function() {
+                       var _hex = $('#text-color').val();
                        var hex = _hex;
                        if ( hex[0] != '#' )
                                hex = '#' + hex;
                        hex = hex.replace(/[^#a-fA-F0-9]+/, '');
                        if ( hex != _hex )
-                               jQuery('#text-color').val(hex);
+                               $('#text-color').val(hex);
                        if ( hex.length == 4 || hex.length == 7 )
                                pickColor( hex );
                });
 
-               jQuery(document).mousedown(function(){
-                       jQuery('#color-picker').each( function() {
-                               var display = jQuery(this).css('display');
+               $(document).mousedown(function(){
+                       $('#color-picker').each( function() {
+                               var display = $(this).css('display');
                                if (display == 'block')
-                                       jQuery(this).fadeOut(2);
+                                       $(this).fadeOut(2);
                        });
                });
 
-               farbtastic = jQuery.farbtastic('#color-picker', function(color) { pickColor(color); });
-               <?php if ( $color = get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
-               pickColor('#<?php echo $color; ?>');
-               <?php } ?>
-
-               <?php if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || ! $this->header_text() ) { ?>
+               farbtastic = $.farbtastic('#color-picker', function(color) { pickColor(color); });
+               <?php if ( display_header_text() ) { ?>
+               pickColor('#<?php echo get_header_textcolor(); ?>');
+               <?php } else { ?>
                toggle_text();
                <?php } ?>
        });
+})(jQuery);
 /* ]]> */
 </script>
 <?php
@@ -420,8 +422,8 @@ class Custom_Image_Header {
        }
 
        jQuery(document).ready(function() {
-               var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
-               var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
+               var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
+               var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
                var ratio = xinit / yinit;
                var ximg = jQuery('img#upload').width();
                var yimg = jQuery('img#upload').height();
@@ -439,14 +441,28 @@ class Custom_Image_Header {
                jQuery('img#upload').imgAreaSelect({
                        handles: true,
                        keys: true,
-                       aspectRatio: xinit + ':' + yinit,
                        show: true,
                        x1: 0,
                        y1: 0,
                        x2: xinit,
                        y2: yinit,
-                       maxHeight: <?php echo HEADER_IMAGE_HEIGHT; ?>,
-                       maxWidth: <?php echo HEADER_IMAGE_WIDTH; ?>,
+                       <?php
+                       if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+                       ?>
+                       aspectRatio: xinit + ':' + yinit,
+                       <?php
+                       }
+                       if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+                       ?>
+                       maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
+                       <?php
+                       }
+                       if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+                       ?>
+                       maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
+                       <?php
+                       }
+                       ?>
                        onInit: function () {
                                jQuery('#width').val(xinit);
                                jQuery('#height').val(yinit);
@@ -483,44 +499,70 @@ class Custom_Image_Header {
 </div>
 <?php } ?>
 
+<h3><?php _e( 'Header Image' ); ?></h3>
+
 <table class="form-table">
 <tbody>
 
-
 <tr valign="top">
 <th scope="row"><?php _e( 'Preview' ); ?></th>
-<td >
+<td>
        <?php if ( $this->admin_image_div_callback ) {
          call_user_func( $this->admin_image_div_callback );
        } else {
        ?>
-       <div id="headimg" style="max-width:<?php echo HEADER_IMAGE_WIDTH; ?>px;height:<?php echo HEADER_IMAGE_HEIGHT; ?>px;background-image:url(<?php esc_url ( header_image() ) ?>);">
+       <div id="headimg" style="background-image:url(<?php esc_url ( header_image() ) ?>);max-width:<?php echo get_custom_header()->width; ?>px;height:<?php echo get_custom_header()->height; ?>px;">
                <?php
-               if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || '' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || ! $this->header_text() )
-                       $style = ' style="display:none;"';
+               if ( display_header_text() )
+                       $style = ' style="color:#' . get_header_textcolor() . ';"';
                else
-                       $style = ' style="color:#' . get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) . ';"';
+                       $style = ' style="display:none;"';
                ?>
-               <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1>
-               <div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
+               <h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1>
+               <div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
        </div>
        <?php } ?>
 </td>
 </tr>
-<?php if ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
+<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 <tr valign="top">
-<th scope="row"><?php _e( 'Upload Image' ); ?></th>
+<th scope="row"><?php _e( 'Select Image' ); ?></th>
 <td>
        <p><?php _e( 'You can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.' ); ?><br />
-       <?php printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); ?></p>
+       <?php
+       if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+               printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
+       } elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
+               if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
+                       printf( __( 'Images should be at least <strong>%1$d pixels</strong> wide.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
+       } elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+               if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
+                       printf( __( 'Images should be at least <strong>%1$d pixels</strong> tall.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+       }
+       if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
+               if ( current_theme_supports( 'custom-header', 'width' ) )
+                       printf( __( 'Suggested width is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'width' ) );
+               if ( current_theme_supports( 'custom-header', 'height' ) )
+                       printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
+       }
+       ?></p>
        <form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
        <p>
                <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
                <input type="file" id="upload" name="import" />
                <input type="hidden" name="action" value="save" />
-               <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ) ?>
+               <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
                <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
        </p>
+       <?php
+               $image_library_url = get_upload_iframe_src( 'image', null, 'library' );
+               $image_library_url = remove_query_arg( 'TB_iframe', $image_library_url );
+               $image_library_url = add_query_arg( array( 'context' => 'custom-header', 'TB_iframe' => 1 ), $image_library_url );
+       ?>
+       <p>
+               <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+               <a id="choose-from-library-link" class="button thickbox" href="<?php echo esc_url( $image_library_url ); ?>"><?php _e( 'Choose Image' ); ?></a>
+       </p>
        </form>
 </td>
 </tr>
@@ -546,7 +588,7 @@ class Custom_Image_Header {
 <tr valign="top">
 <th scope="row"><?php _e( 'Default Images' ); ?></th>
 <td>
-<?php if ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
+<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
        <p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
 <?php else: ?>
        <p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
@@ -567,7 +609,8 @@ class Custom_Image_Header {
 </tr>
        <?php endif;
 
-       if ( defined( 'HEADER_IMAGE' ) && '' != HEADER_IMAGE ) : ?>
+       $default_image = get_theme_support( 'custom-header', 'default-image' );
+       if ( $default_image && get_header_image() != $default_image ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>
 <td>
@@ -579,33 +622,37 @@ class Custom_Image_Header {
 </tbody>
 </table>
 
-       <?php if ( $this->header_text() ) : ?>
+<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+
+<h3><?php _e( 'Header Text' ); ?></h3>
+
 <table class="form-table">
 <tbody>
-<tr valign="top" class="hide-if-no-js">
-<th scope="row"><?php _e( 'Display Text' ); ?></th>
+<tr valign="top">
+<th scope="row"><?php _e( 'Header Text' ); ?></th>
 <td>
        <p>
-       <?php $hidetext = get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?>
-       <label><input type="radio" value="1" name="hidetext" id="hidetext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) )  ? true : false ); ?> /> <?php _e( 'No' ); ?></label>
-       <label><input type="radio" value="0" name="hidetext" id="showtext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) ) ? false : true ); ?> /> <?php _e( 'Yes' ); ?></label>
+       <label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
        </p>
 </td>
 </tr>
 
-<tr valign="top" id="text-color-row">
+<tr valign="top" class="displaying-header-text">
 <th scope="row"><?php _e( 'Text Color' ); ?></th>
 <td>
        <p>
-               <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) ); ?>" />
-               <span class="description hide-if-js"><?php _e( 'If you want to hide header text, add <strong>#blank</strong> as text color.' );?></span>
-               <input type="button" class="button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color' ); ?>" id="pickcolor" />
+<?php if ( display_header_text() ) : ?>
+               <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_header_textcolor() ); ?>" />
+<?php else : ?>
+               <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_support( 'custom-header', 'default-text-color' ) ); ?>" />
+<?php endif; ?>
+               <a href="#" class="hide-if-no-js" id="pickcolor"><?php _e( 'Select a Color' ); ?></a>
        </p>
        <div id="color-picker" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
 </td>
 </tr>
 
-       <?php if ( defined('HEADER_TEXTCOLOR') && get_theme_mod('header_textcolor') ) { ?>
+       <?php if ( current_theme_supports( 'custom-header', 'default-text-color' ) && get_theme_mod( 'header_textcolor' ) ) { ?>
 <tr valign="top">
 <th scope="row"><?php _e('Reset Text Color'); ?></th>
 <td>
@@ -617,7 +664,7 @@ class Custom_Image_Header {
 
 </tbody>
 </table>
-       <?php endif;
+<?php endif;
 
 do_action( 'custom_header_options' );
 
@@ -636,49 +683,55 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
         */
        function step_2() {
                check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-               if ( ! current_theme_supports( 'custom-header-uploads' ) )
+               if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
                        wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-               $overrides = array('test_form' => false);
-               $file = wp_handle_upload($_FILES['import'], $overrides);
-
-               if ( isset($file['error']) )
-                       wp_die( $file['error'],  __( 'Image Upload Error' ) );
-
-               $url = $file['url'];
-               $type = $file['type'];
-               $file = $file['file'];
-               $filename = basename($file);
+               if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
+                       $attachment_id = absint( $_GET['file'] );
+                       $file = get_attached_file( $attachment_id, true );
+                       $url = wp_get_attachment_image_src( $attachment_id, 'full');
+                       $url = $url[0];
+               } elseif ( isset( $_POST ) ) {
+                       extract($this->step_2_manage_upload());
+               }
 
-               // Construct the object array
-               $object = array(
-               'post_title' => $filename,
-               'post_content' => $url,
-               'post_mime_type' => $type,
-               'guid' => $url,
-               'context' => 'custom-header'
-               );
+               if ( file_exists( $file ) ) {
+                       list( $width, $height, $type, $attr ) = getimagesize( $file );
+               } else {
+                       $data = wp_get_attachment_metadata( $attachment_id );
+                       $height = $data[ 'height' ];
+                       $width = $data[ 'width' ];
+                       unset( $data );
+               }
 
-               // Save the data
-               $id = wp_insert_attachment($object, $file);
+               $max_width = 0;
+               // For flex, limit size of image displayed to 1500px unless theme says otherwise
+               if ( current_theme_supports( 'custom-header', 'flex-width' ) )
+                       $max_width = 1500;
 
-               list($width, $height, $type, $attr) = getimagesize( $file );
+               if ( current_theme_supports( 'custom-header', 'max-width' ) )
+                       $max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+               $max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
-               if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
+               // If flexible height isn't supported and the image is the exact right size
+               if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )
+                       && $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
+               {
                        // Add the meta-data
-                       wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-                       update_post_meta( $id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
+                       if ( file_exists( $file ) )
+                               wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 
-                       set_theme_mod('header_image', esc_url($url));
-                       do_action('wp_create_file_in_uploads', $file, $id); // For replication
+                       $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+
+                       do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
                        return $this->finished();
-               } elseif ( $width > HEADER_IMAGE_WIDTH ) {
-                       $oitar = $width / HEADER_IMAGE_WIDTH;
-                       $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-                       if ( is_wp_error( $image ) )
-                               wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
+               } elseif ( $width > $max_width ) {
+                       $oitar = $width / $max_width;
+                       $image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
+                       if ( ! $image || is_wp_error( $image ) )
+                               wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
-                       $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
+                       $image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication
 
                        $url = str_replace(basename($url), basename($image), $url);
                        $width = $width / $oitar;
@@ -704,25 +757,66 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
        <input type="hidden" name="y1" id="y1" value="0"/>
        <input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
        <input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
-       <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" />
+       <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
        <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
+       <?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+       <input type="hidden" name="create-new-attachment" value="true" />
+       <?php } ?>
        <?php wp_nonce_field( 'custom-header-crop-image' ) ?>
 
-       <?php submit_button( __( 'Crop and Publish' ) ); ?>
+       <p class="submit">
+       <?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+       <?php
+       if ( isset( $oitar ) && 1 == $oitar )
+               submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+       ?>
        </p>
 </form>
 </div>
                <?php
        }
 
+
+       /**
+        * Upload the file to be cropped in the second step.
+        *
+        * @since 3.4.0
+        */
+       function step_2_manage_upload() {
+               $overrides = array('test_form' => false);
+               $file = wp_handle_upload($_FILES['import'], $overrides);
+
+               if ( isset($file['error']) )
+                       wp_die( $file['error'],  __( 'Image Upload Error' ) );
+
+               $url = $file['url'];
+               $type = $file['type'];
+               $file = $file['file'];
+               $filename = basename($file);
+
+               // Construct the object array
+               $object = array(
+                       'post_title'     => $filename,
+                       'post_content'   => $url,
+                       'post_mime_type' => $type,
+                       'guid'           => $url,
+                       'context'        => 'custom-header'
+               );
+
+               // Save the data
+               $attachment_id = wp_insert_attachment( $object, $file );
+               return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+       }
+
        /**
         * Display third step of custom header image page.
         *
         * @since 2.1.0
         */
        function step_3() {
-               check_admin_referer('custom-header-crop-image');
-               if ( ! current_theme_supports( 'custom-header-uploads' ) )
+               check_admin_referer( 'custom-header-crop-image' );
+
+               if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
                        wp_die( __( 'Cheatin&#8217; uh?' ) );
 
                if ( $_POST['oitar'] > 1 ) {
@@ -735,37 +829,75 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
                $attachment_id = absint( $_POST['attachment_id'] );
                $original = get_attached_file($attachment_id);
 
-               $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT );
-               if ( is_wp_error( $cropped ) )
-                       wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
+
+               $max_width = 0;
+               // For flex, limit size of image displayed to 1500px unless theme says otherwise
+               if ( current_theme_supports( 'custom-header', 'flex-width' ) )
+                       $max_width = 1500;
+
+               if ( current_theme_supports( 'custom-header', 'max-width' ) )
+                       $max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+               $max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
+
+               if ( ( current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) || $_POST['width'] > $max_width )
+                       $dst_height = absint( $_POST['height'] * ( $max_width / $_POST['width'] ) );
+               elseif ( current_theme_supports( 'custom-header', 'flex-height' ) && current_theme_supports( 'custom-header', 'flex-width' ) )
+                       $dst_height = absint( $_POST['height'] );
+               else
+                       $dst_height = get_theme_support( 'custom-header', 'height' );
+
+               if ( ( current_theme_supports( 'custom-header', 'flex-width' ) && ! current_theme_supports( 'custom-header', 'flex-height' ) ) || $_POST['width'] > $max_width )
+                       $dst_width = absint( $_POST['width'] * ( $max_width / $_POST['width'] ) );
+               elseif ( current_theme_supports( 'custom-header', 'flex-width' ) && current_theme_supports( 'custom-header', 'flex-height' ) )
+                       $dst_width = absint( $_POST['width'] );
+               else
+                       $dst_width = get_theme_support( 'custom-header', 'width' );
+
+               if ( empty( $_POST['skip-cropping'] ) )
+                       $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $dst_width, $dst_height );
+               elseif ( ! empty( $_POST['create-new-attachment'] ) )
+                       $cropped = _copy_image_file( $attachment_id );
+               else
+                       $cropped = get_attached_file( $attachment_id );
+
+               if ( ! $cropped || is_wp_error( $cropped ) )
+                       wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
                $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
                $parent = get_post($attachment_id);
                $parent_url = $parent->guid;
-               $url = str_replace(basename($parent_url), basename($cropped), $parent_url);
+               $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+
+               $size = @getimagesize( $cropped );
+               $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
                // Construct the object array
                $object = array(
                        'ID' => $attachment_id,
                        'post_title' => basename($cropped),
                        'post_content' => $url,
-                       'post_mime_type' => 'image/jpeg',
+                       'post_mime_type' => $image_type,
                        'guid' => $url,
                        'context' => 'custom-header'
                );
+               if ( ! empty( $_POST['create-new-attachment'] ) )
+                       unset( $object['ID'] );
 
                // Update the attachment
-               wp_insert_attachment($object, $cropped);
+               $attachment_id = wp_insert_attachment( $object, $cropped );
                wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );
-               update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
 
-               set_theme_mod('header_image', $url);
+               $width = $dst_width;
+               $height = $dst_height;
+               $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
                // cleanup
-               $medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
-               @unlink( apply_filters( 'wp_delete_file', $medium ) );
-               @unlink( apply_filters( 'wp_delete_file', $original ) );
+               $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
+               if ( file_exists( $medium ) )
+                       @unlink( apply_filters( 'wp_delete_file', $medium ) );
+               if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) )
+                       @unlink( apply_filters( 'wp_delete_file', $original ) );
 
                return $this->finished();
        }
@@ -789,13 +921,132 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
                if ( ! current_user_can('edit_theme_options') )
                        wp_die(__('You do not have permission to customize headers.'));
                $step = $this->step();
-               if ( 1 == $step )
-                       $this->step_1();
-               elseif ( 2 == $step )
+               if ( 2 == $step )
                        $this->step_2();
                elseif ( 3 == $step )
                        $this->step_3();
+               else
+                       $this->step_1();
+       }
+
+       /**
+        * Replace default attachment actions with "Set as header" link.
+        *
+        * @since 3.4.0
+        */
+       function attachment_fields_to_edit( $form_fields, $post ) {
+               $form_fields = array();
+               $href = esc_url(add_query_arg(array(
+                       'page' => 'custom-header',
+                       'step' => 2,
+                       '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
+                       'file' => $post->ID
+               ), admin_url('themes.php')));
+
+               $form_fields['buttons'] = array( 'tr' => '<tr class="submit"><td></td><td><a data-location="' . $href . '" class="wp-set-header">' . __( 'Set as header' ) . '</a></td></tr>' );
+               $form_fields['context'] = array( 'input' => 'hidden', 'value' => 'custom-header' );
+
+               return $form_fields;
+       }
+
+       /**
+        * Leave only "Media Library" tab in the uploader window.
+        *
+        * @since 3.4.0
+        */
+       function filter_upload_tabs() {
+               return array( 'library' => __('Media Library') );
+       }
+
+       /**
+        * Choose a header image, selected from existing uploaded and default headers,
+        * or provide an array of uploaded header data (either new, or from media library).
+        *
+        * @param mixed $choice Which header image to select. Allows for values of 'random-default-image',
+        *      for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
+        *      among the uploaded images; the key of a default image registered for that theme; and
+        *      the key of an image uploaded for that theme (the basename of the URL).
+        *  Or an array of arguments: attachment_id, url, width, height. All are required.
+        *
+        * @since 3.4.0
+        */
+       final public function set_header_image( $choice ) {
+               if ( is_array( $choice ) || is_object( $choice ) ) {
+                       $choice = (array) $choice;
+                       if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
+                               return;
+
+                       $choice['url'] = esc_url_raw( $choice['url'] );
+
+                       $header_image_data = (object) array(
+                               'attachment_id' => $choice['attachment_id'],
+                               'url'           => $choice['url'],
+                               'thumbnail_url' => $choice['url'],
+                               'height'        => $choice['height'],
+                               'width'         => $choice['width'],
+                       );
+
+                       update_post_meta( $choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet() );
+                       set_theme_mod( 'header_image', $choice['url'] );
+                       set_theme_mod( 'header_image_data', $header_image_data );
+                       return;
+               }
+
+               if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ) ) ) {
+                       set_theme_mod( 'header_image', $choice );
+                       remove_theme_mod( 'header_image_data' );
+                       return;
+               }
+
+               $uploaded = get_uploaded_header_images();
+               if ( $uploaded && isset( $uploaded[ $choice ] ) ) {
+                       $header_image_data = $uploaded[ $choice ];
+
+               } else {
+                       $this->process_default_headers();
+                       if ( isset( $this->default_headers[ $choice ] ) )
+                               $header_image_data = $this->default_headers[ $choice ];
+                       else
+                               return;
+               }
+
+               set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
+               set_theme_mod( 'header_image_data', $header_image_data );
+       }
+
+       /**
+        * Remove a header image.
+        *
+        * @since 3.4.0
+        */
+       final public function remove_header_image() {
+               return $this->set_header_image( 'remove-header' );
        }
 
+       /**
+        * Reset a header image to the default image for the theme.
+        *
+        * This method does not do anything if the theme does not have a default header image.
+        *
+        * @since 3.4.0
+        */
+       final public function reset_header_image() {
+               $this->process_default_headers();
+               $default = get_theme_support( 'custom-header', 'default-image' );
+
+               if ( ! $default )
+                       return $this->remove_header_image();
+
+               $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+
+               foreach ( $this->default_headers as $header => $details ) {
+                       if ( $details['url'] == $default ) {
+                               $default_data = $details;
+                               break;
+                       }
+               }
+
+               set_theme_mod( 'header_image', $default );
+               set_theme_mod( 'header_image_data', (object) $default_data );
+       }
 }
-?>