WordPress 3.4.2-scripts

[autoinstalls/wordpress.git] / wp-admin / custom-header.php

diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index fb07fe8013af3e5d6a7e2cb14b55ffe8b53a590b..fc9d4f126f10894ea7e8b1edd341857a50138cb9 100644 (file)
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -9,7 +9,7 @@
 /**
  * The custom header image class.
  *
 /**
  * The custom header image class.
  *

- * @since unknown
+ * @since 2.1.0

  * @package WordPress
  * @subpackage Administration
  */
  * @package WordPress
  * @subpackage Administration
  */


@@ -19,41 +19,132 @@ class Custom_Image_Header {
         * Callback for administration header.
         *
         * @var callback
         * Callback for administration header.
         *
         * @var callback

-        * @since unknown
+        * @since 2.1.0

         * @access private
         */
        var $admin_header_callback;
 
        /**
         * @access private
         */
        var $admin_header_callback;
 
        /**

-        * PHP4 Constructor - Register administration header callback.
+        * Callback for header div.

         *
         *

-        * @since unknown
+        * @var callback
+        * @since 3.0.0
+        * @access private
+        */
+       var $admin_image_div_callback;
+
+       /**
+        * Holds default headers.
+        *
+        * @var array
+        * @since 3.0.0
+        * @access private
+        */
+       var $default_headers = array();
+
+       /**
+        * Holds custom headers uploaded by the user
+        *
+        * @var array
+        * @since 3.2.0
+        * @access private
+        */
+       var $uploaded_headers = array();
+
+       /**
+        * Holds the page menu hook.
+        *
+        * @var string
+        * @since 3.0.0
+        * @access private
+        */
+       var $page = '';
+
+       /**
+        * Constructor - Register administration header callback.
+        *
+        * @since 2.1.0

         * @param callback $admin_header_callback
         * @param callback $admin_header_callback

+        * @param callback $admin_image_div_callback Optional custom image div output callback.

         * @return Custom_Image_Header
         */
         * @return Custom_Image_Header
         */

-       function Custom_Image_Header($admin_header_callback) {
+       function __construct($admin_header_callback, $admin_image_div_callback = '') {

                $this->admin_header_callback = $admin_header_callback;
                $this->admin_header_callback = $admin_header_callback;

+               $this->admin_image_div_callback = $admin_image_div_callback;
+
+               add_action( 'admin_menu', array( $this, 'init' ) );

        }
 
        /**
        }
 
        /**

-        * Setup the hooks for the Custom Header admin page.
+        * Set up the hooks for the Custom Header admin page.

         *
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function init() {
         */
        function init() {

-               $page = add_theme_page(__('Custom Header'), __('Custom Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page'));
+               if ( ! current_user_can('edit_theme_options') )
+                       return;
+
+               $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page'));

 
                add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
                add_action("admin_print_styles-$page", array(&$this, 'css_includes'));
 
                add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
                add_action("admin_print_styles-$page", array(&$this, 'css_includes'));

+               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", 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' );
+               }
+       }
+
+       /**
+        * Adds contextual help.
+        *
+        * @since 3.0.0
+        */
+       function help() {
+               get_current_screen()->add_help_tab( array(
+                       'id'      => 'overview',
+                       'title'   => __('Overview'),
+                       'content' =>
+                               '<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(
+                       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+                       '<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>' ) . '</p>' .
+                       '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+               );

        }
 
        /**
         * Get the current step.
         *
        }
 
        /**
         * Get the current step.
         *

-        * @since unknown
+        * @since 2.6.0

         *
         * @return int Current step
         */
         *
         * @return int Current step
         */


@@ -62,149 +153,255 @@ class Custom_Image_Header {
                        return 1;
 
                $step = (int) $_GET['step'];
                        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;
        }
 
        /**
 
                return $step;
        }
 
        /**

-        * Setup the enqueue for the JavaScript files.
+        * Set up the enqueue for the JavaScript files.

         *
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function js_includes() {
                $step = $this->step();
 
         */
        function js_includes() {
                $step = $this->step();
 

-               if ( 1 == $step )
-                       wp_enqueue_script('farbtastic');
-               elseif ( 2 == $step )
-                       wp_enqueue_script('jcrop');
+               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');
+               }

        }
 
        /**
        }
 
        /**

-        * Setup the enqueue for the CSS files
+        * Set up the enqueue for the CSS files

         *
         * @since 2.7
         */
        function css_includes() {
                $step = $this->step();
 
         *
         * @since 2.7
         */
        function css_includes() {
                $step = $this->step();
 

-               if ( 1 == $step )
+               if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )

                        wp_enqueue_style('farbtastic');
                elseif ( 2 == $step )
                        wp_enqueue_style('farbtastic');
                elseif ( 2 == $step )

-                       wp_enqueue_style('jcrop');
+                       wp_enqueue_style('imgareaselect');

        }
 
        /**
         * Execute custom header modification.
         *
        }
 
        /**
         * Execute custom header modification.
         *

-        * @since unknown
+        * @since 2.6.0

         */
        function take_action() {
         */
        function take_action() {

-               if ( isset( $_POST['textcolor'] ) ) {
-                       check_admin_referer('custom-header');
-                       if ( 'blank' == $_POST['textcolor'] ) {
-                               set_theme_mod('header_textcolor', 'blank');
-                       } else {
-                               $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']);
-                               if ( strlen($color) == 6 || strlen($color) == 3 )
-                                       set_theme_mod('header_textcolor', $color);
-                       }
+               if ( ! current_user_can('edit_theme_options') )
+                       return;
+
+               if ( empty( $_POST ) )
+                       return;
+
+               $this->updated = true;
+
+               if ( isset( $_POST['resetheader'] ) ) {
+                       check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+                       $this->reset_header_image();
+                       return;
+               }
+
+               if ( isset( $_POST['resettext'] ) ) {
+                       check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+                       remove_theme_mod('header_textcolor');
+                       return;
+               }
+
+               if ( isset( $_POST['removeheader'] ) ) {
+                       check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+                       $this->remove_header_image();
+                       return;
+               }
+
+               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'] );
+                       $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' );
+               }
+
+               if ( isset( $_POST['default-header'] ) ) {
+                       check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+                       $this->set_header_image( $_POST['default-header'] );
+                       return;
+               }
+       }
+
+       /**
+        * Process the default headers
+        *
+        * @since 3.0.0
+        */
+       function process_default_headers() {
+               global $_wp_default_headers;
+
+               if ( !empty($this->headers) )
+                       return;
+
+               if ( !isset($_wp_default_headers) )
+                       return;
+
+               $this->default_headers = $_wp_default_headers;
+               $template_directory_uri = get_template_directory_uri();
+               $stylesheet_directory_uri = get_stylesheet_directory_uri();
+               foreach ( array_keys($this->default_headers) as $header ) {
+                       $this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
+                       $this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
+               }
+
+       }
+
+       /**
+        * Display UI for selecting one of several default headers.
+        *
+        * Show the random image option if this theme has multiple header images.
+        * Random image option is on by default if no header has been set.
+        *
+        * @since 3.0.0
+        */
+       function show_header_selector( $type = 'default' ) {
+               if ( 'default' == $type ) {
+                       $headers = $this->default_headers;
+               } else {
+                       $headers = get_uploaded_header_images();
+                       $type = 'uploaded';

                }
                }

-               if ( isset($_POST['resetheader']) ) {
-                       check_admin_referer('custom-header');
-                       remove_theme_mods();
+
+               if ( 1 < count( $headers ) ) {
+                       echo '<div class="random-header">';
+                       echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
+                       echo __( '<strong>Random:</strong> Show a different image on each page.' );
+                       echo '</label>';
+                       echo '</div>';

                }
                }

+
+               echo '<div class="available-headers">';
+               foreach ( $headers as $header_key => $header ) {
+                       $header_thumbnail = $header['thumbnail_url'];
+                       $header_url = $header['url'];
+                       $header_desc = empty( $header['description'] ) ? '' : $header['description'];
+                       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['attachment_id'] ) )
+                               $width = ' width="230"';
+                       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>';

        }
 
        /**
         * Execute Javascript depending on step.
         *
        }
 
        /**
         * Execute Javascript depending on step.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function js() {
                $step = $this->step();
         */
        function js() {
                $step = $this->step();

-               if ( 1 == $step )
+               if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )

                        $this->js_1();
                elseif ( 2 == $step )
                        $this->js_2();
        }
 
        /**
                        $this->js_1();
                elseif ( 2 == $step )
                        $this->js_2();
        }
 
        /**

-        * Display Javascript based on Step 1.
+        * Display Javascript based on Step 1 and 3.

         *
         *

-        * @since unknown
+        * @since 2.6.0

         */
        function js_1() { ?>
 <script type="text/javascript">
         */
        function js_1() { ?>
 <script type="text/javascript">

-       var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor'];
-       var farbtastic;
+/* <![CDATA[ */
+var farbtastic;
+(function($){
+       var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
+               header_text_fields;

 
        function pickColor(color) {
 
        function pickColor(color) {

-               jQuery('#name').css('color', color);
-               jQuery('#desc').css('color', color);
-               jQuery('#textcolor').val(color);
+               $('#name').css('color', color);
+               $('#desc').css('color', color);
+               $('#text-color').val(color);

                farbtastic.setColor(color);
        }
 
                farbtastic.setColor(color);
        }
 

-       jQuery(document).ready(function() {
-               jQuery('#pickcolor').click(function() {
-                       jQuery('#colorPickerDiv').show();
-               });
+       function toggle_text() {
+               var checked = $('#display-header-text').prop('checked'),
+                       text_color;
+               header_text_fields.toggle( checked );
+               if ( ! checked )
+                       return;
+               text_color = $('#text-color');
+               if ( '' == text_color.val().replace('#', '') ) {
+                       text_color.val( default_color );
+                       pickColor( default_color );
+               } else {
+                       pickColor( text_color.val() );
+               }
+       }

 
 

-               jQuery('#hidetext').click(function() {
-                       toggle_text();
+       $(document).ready(function() {
+               header_text_fields = $('.displaying-header-text');
+               $('#pickcolor').click(function(e) {
+                       e.preventDefault();
+                       $('#color-picker').show();

                });
 
                });
 

-               farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); });
-               pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>');
-
-               <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
-               toggle_text();
-               <?php } ?>
-       });
-
-       jQuery(document).mousedown(function(){
-               // Make the picker disappear, since we're using it in an independant div
-               hide_picker();
-       });
+               $('#display-header-text').click( toggle_text );

 
 

-       function colorDefault() {
-               pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');
-       }
-
-       function hide_picker(what) {
-               var update = false;
-               jQuery('#colorPickerDiv').each(function(){
-                       var id = jQuery(this).attr('id');
-                       if (id == what) {
-                               return;
-                       }
-                       var display = jQuery(this).css('display');
-                       if (display == 'block') {
-                               jQuery(this).fadeOut(2);
-                       }
+               $('#defaultcolor').click(function() {
+                       pickColor(default_color);
+                       $('#text-color').val(default_color);

                });
                });

-       }
-
-       function toggle_text(force) {
-               if(jQuery('#textcolor').val() == 'blank') {
-                       //Show text
-                       jQuery( buttons.toString() ).show();
-                       jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');
-                       jQuery('#hidetext').val('<?php _e('Hide Text'); ?>');
-               }
-               else {
-                       //Hide text
-                       jQuery( buttons.toString() ).hide();
-                       jQuery('#textcolor').val('blank');
-                       jQuery('#hidetext').val('<?php _e('Show Text'); ?>');
-               }
-       }

 
 

+               $('#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 )
+                               $('#text-color').val(hex);
+                       if ( hex.length == 4 || hex.length == 7 )
+                               pickColor( hex );
+               });

 
 

+               $(document).mousedown(function(){
+                       $('#color-picker').each( function() {
+                               var display = $(this).css('display');
+                               if (display == 'block')
+                                       $(this).fadeOut(2);
+                       });
+               });

 
 

+               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
        }
 </script>
 <?php
        }


@@ -212,34 +409,24 @@ class Custom_Image_Header {
        /**
         * Display Javascript based on Step 2.
         *
        /**
         * Display Javascript based on Step 2.
         *

-        * @since unknown
+        * @since 2.6.0

         */
        function js_2() { ?>
 <script type="text/javascript">
         */
        function js_2() { ?>
 <script type="text/javascript">

+/* <![CDATA[ */

        function onEndCrop( coords ) {
                jQuery( '#x1' ).val(coords.x);
                jQuery( '#y1' ).val(coords.y);
        function onEndCrop( coords ) {
                jQuery( '#x1' ).val(coords.x);
                jQuery( '#y1' ).val(coords.y);

-               jQuery( '#x2' ).val(coords.x2);
-               jQuery( '#y2' ).val(coords.y2);

                jQuery( '#width' ).val(coords.w);
                jQuery( '#height' ).val(coords.h);
        }
 
                jQuery( '#width' ).val(coords.w);
                jQuery( '#height' ).val(coords.h);
        }
 

-       // with a supplied ratio

        jQuery(document).ready(function() {
        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 ratio = xinit / yinit;

-               var ximg = jQuery('#upload').width();
-               var yimg = jQuery('#upload').height();
-
-               //set up default values
-               jQuery( '#x1' ).val(0);
-               jQuery( '#y1' ).val(0);
-               jQuery( '#x2' ).val(xinit);
-               jQuery( '#y2' ).val(yinit);
-               jQuery( '#width' ).val(xinit);
-               jQuery( '#height' ).val(yinit);
+               var ximg = jQuery('img#upload').width();
+               var yimg = jQuery('img#upload').height();

 
                if ( yimg < yinit || ximg < xinit ) {
                        if ( ximg / yimg > ratio ) {
 
                if ( yimg < yinit || ximg < xinit ) {
                        if ( ximg / yimg > ratio ) {


@@ -251,12 +438,44 @@ class Custom_Image_Header {
                        }
                }
 
                        }
                }
 

-               jQuery('#upload').Jcrop({
-                       aspectRatio: ratio,
-                       setSelect: [ 0, 0, xinit, yinit ],
-                       onSelect: onEndCrop
+               jQuery('img#upload').imgAreaSelect({
+                       handles: true,
+                       keys: true,
+                       show: true,
+                       x1: 0,
+                       y1: 0,
+                       x2: xinit,
+                       y2: yinit,
+                       <?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);
+                       },
+                       onSelectChange: function(img, c) {
+                               jQuery('#x1').val(c.x1);
+                               jQuery('#y1').val(c.y1);
+                               jQuery('#width').val(c.width);
+                               jQuery('#height').val(c.height);
+                       }

                });
        });
                });
        });

+/* ]]> */

 </script>
 <?php
        }
 </script>
 <?php
        }


@@ -264,103 +483,255 @@ class Custom_Image_Header {
        /**
         * Display first step of custom header image page.
         *
        /**
         * Display first step of custom header image page.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function step_1() {
         */
        function step_1() {

-               if ( $_GET['updated'] ) { ?>
-<div id="message" class="updated fade">
-<p><?php _e('Header updated.') ?></p>
-</div>
-               <?php } ?>
+               $this->process_default_headers();
+?>

 
 <div class="wrap">
 <?php screen_icon(); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>

-<h2><?php _e('Your Header Image'); ?></h2>
-<p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
+<h2><?php _e('Custom Header'); ?></h2>

 
 

-<div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);">
-<h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
-<div id="desc"><?php bloginfo('description');?></div>
+<?php if ( ! empty( $this->updated ) ) { ?>
+<div id="message" class="updated">
+<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>

 </div>
 </div>

-<?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
-<form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
-<input type="button" class="button" value="<?php esc_attr_e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
-<input type="button" class="button" value="<?php esc_attr_e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" class="button" value="<?php esc_attr_e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="hidden" name="textcolor" id="textcolor" value="#<?php esc_attr(header_textcolor()) ?>" /><input name="submit" type="submit" class="button" value="<?php esc_attr_e('Save Changes'); ?>" /></form>

 <?php } ?>
 
 <?php } ?>
 

-<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div>
-</div>
-<div class="wrap">
-<h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p>
-<p><?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
-
-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
-<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') ?>
-<p class="submit">
-<input type="submit" value="<?php esc_attr_e('Upload'); ?>" />
-</p>
-</form>
+<h3><?php _e( 'Header Image' ); ?></h3>

 
 

-</div>
+<table class="form-table">
+<tbody>

 
 

-               <?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
-<div class="wrap">
-<h2><?php _e('Reset Header Image and Color'); ?></h2>
-<p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-header'); ?>
-<input type="submit" class="button" name="resetheader" value="<?php esc_attr_e('Restore Original Header'); ?>" />
+<tr valign="top">
+<th scope="row"><?php _e( 'Preview' ); ?></th>
+<td>
+       <?php if ( $this->admin_image_div_callback ) {
+         call_user_func( $this->admin_image_div_callback );
+       } else {
+       ?>
+       <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 ( display_header_text() )
+                       $style = ' style="color:#' . get_header_textcolor() . ';"';
+               else
+                       $style = ' style="display:none;"';
+               ?>
+               <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' ) ) : ?>
+<tr valign="top">
+<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
+       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 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>
+<?php endif; ?>
+</tbody>
+</table>
+
+<form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 1 ) ) ?>">
+<table class="form-table">
+<tbody>
+       <?php if ( get_uploaded_header_images() ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
+<td>
+       <p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ) ?></p>
+       <?php
+               $this->show_header_selector( 'uploaded' );
+       ?>
+</td>
+</tr>
+       <?php endif;
+       if ( ! empty( $this->default_headers ) ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<td>
+<?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>
+<?php endif; ?>
+       <?php
+               $this->show_header_selector( 'default' );
+       ?>
+</td>
+</tr>
+       <?php endif;
+       if ( get_header_image() ) : ?>
+<tr valign="top">
+<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<td>
+       <p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
+       <?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
+</td>
+</tr>
+       <?php endif;
+
+       $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>
+       <p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
+       <?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
+</td>
+</tr>
+       <?php endif; ?>
+</tbody>
+</table>
+
+<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+
+<h3><?php _e( 'Header Text' ); ?></h3>
+
+<table class="form-table">
+<tbody>
+<tr valign="top">
+<th scope="row"><?php _e( 'Header Text' ); ?></th>
+<td>
+       <p>
+       <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" class="displaying-header-text">
+<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<td>
+       <p>
+<?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 ( 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>
+       <p><?php _e( 'This will restore the original header text. You will not be able to restore any customizations.' ) ?></p>
+       <?php submit_button( __( 'Restore Original Header Text' ), 'button', 'resettext', false ); ?>
+</td>
+</tr>
+       <?php } ?>
+
+</tbody>
+</table>
+<?php endif;
+
+do_action( 'custom_header_options' );
+
+wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
+
+<?php submit_button( null, 'primary', 'save-header-options' ); ?>

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

-               <?php endif;

 
 

-       }
+<?php }

 
        /**
         * Display second step of custom header image page.
         *
 
        /**
         * Display second step of custom header image page.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function step_2() {
         */
        function step_2() {

-               check_admin_referer('custom-header');
-               $overrides = array('test_form' => false);
-               $file = wp_handle_upload($_FILES['import'], $overrides);
-
-               if ( isset($file['error']) )
-               die( $file['error'] );
-
-               $url = $file['url'];
-               $type = $file['type'];
-               $file = $file['file'];
-               $filename = basename($file);
+               check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
+               if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
+                       wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+               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);
+               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
                        // Add the meta-data

-                       wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+                       if ( file_exists( $file ) )
+                               wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+
+                       $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );

 
 

-                       set_theme_mod('header_image', esc_url($url));
-                       do_action('wp_create_file_in_uploads', $file, $id); // For replication
+                       do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication

                        return $this->finished();
                        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));
-                       $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
+               } 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, $attachment_id); // For replication

 
                        $url = str_replace(basename($url), basename($image), $url);
                        $width = $width / $oitar;
 
                        $url = str_replace(basename($url), basename($image), $url);
                        $width = $width / $oitar;


@@ -371,39 +742,83 @@ class Custom_Image_Header {
                ?>
 
 <div class="wrap">
                ?>
 
 <div class="wrap">

+<?php screen_icon(); ?>
+<h2><?php _e( 'Crop Header Image' ); ?></h2>
+
+<form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>">
+       <p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
+       <p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
+
+       <div id="crop_image" style="position: relative">
+               <img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
+       </div>
+
+       <input type="hidden" name="x1" id="x1" value="0"/>
+       <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( $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' ) ?>
+
+       <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
+       }

 
 

-<form method="POST" action="<?php echo esc_attr(add_query_arg('step', 3)) ?>">

 
 

-<p><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-<div id="testWrap" style="position: relative">
-<img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
-</div>
+       /**
+        * 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);

 
 

-<p class="submit">
-<input type="hidden" name="x1" id="x1" />
-<input type="hidden" name="y1" id="y1" />
-<input type="hidden" name="x2" id="x2" />
-<input type="hidden" name="y2" id="y2" />
-<input type="hidden" name="width" id="width" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($id); ?>" />
-<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="submit" value="<?php esc_attr_e('Crop Header'); ?>" />
-</p>
+               if ( isset($file['error']) )
+                       wp_die( $file['error'],  __( 'Image Upload Error' ) );

 
 

-</form>
-</div>
-               <?php
+               $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.
         *
        }
 
        /**
         * Display third step of custom header image page.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function step_3() {
         */
        function step_3() {

-               check_admin_referer('custom-header');
+               check_admin_referer( 'custom-header-crop-image' );
+
+               if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
+                       wp_die( __( 'Cheatin&#8217; uh?' ) );
+

                if ( $_POST['oitar'] > 1 ) {
                        $_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
                        $_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
                if ( $_POST['oitar'] > 1 ) {
                        $_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
                        $_POST['y1'] = $_POST['y1'] * $_POST['oitar'];


@@ -411,34 +826,78 @@ class Custom_Image_Header {
                        $_POST['height'] = $_POST['height'] * $_POST['oitar'];
                }
 
                        $_POST['height'] = $_POST['height'] * $_POST['oitar'];
                }
 

-               $original = get_attached_file( $_POST['attachment_id'] );
+               $attachment_id = absint( $_POST['attachment_id'] );
+               $original = get_attached_file($attachment_id);
+
+
+               $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' ) );

 
 

-               $cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
-               $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication
+               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' );

 
 

-               $parent = get_post($_POST['attachment_id']);
+               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;
                $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(
 
                // Construct the object array
                $object = array(

-                       'ID' => $_POST['attachment_id'],
+                       'ID' => $attachment_id,

                        'post_title' => basename($cropped),
                        'post_content' => $url,
                        'post_title' => basename($cropped),
                        'post_content' => $url,

-                       'post_mime_type' => 'image/jpeg',
-                       'guid' => $url
+                       'post_mime_type' => $image_type,
+                       'guid' => $url,
+                       'context' => 'custom-header'

                );
                );

+               if ( ! empty( $_POST['create-new-attachment'] ) )
+                       unset( $object['ID'] );

 
                // Update the attachment
 
                // Update the attachment

-               wp_insert_attachment($object, $cropped);
-               wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) );
+               $attachment_id = wp_insert_attachment( $object, $cropped );
+               wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );

 
 

-               set_theme_mod('header_image', $url);
+               $width = $dst_width;
+               $height = $dst_height;
+               $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );

 
                // cleanup
 
                // 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();
        }
 
                return $this->finished();
        }


@@ -446,33 +905,148 @@ class Custom_Image_Header {
        /**
         * Display last step of custom header image page.
         *
        /**
         * Display last step of custom header image page.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function finished() {
         */
        function finished() {

-               ?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-               <?php
+               $this->updated = true;
+               $this->step_1();

        }
 
        /**
         * Display the page based on the current step.
         *
        }
 
        /**
         * Display the page based on the current step.
         *

-        * @since unknown
+        * @since 2.1.0

         */
        function admin_page() {
         */
        function admin_page() {

+               if ( ! current_user_can('edit_theme_options') )
+                       wp_die(__('You do not have permission to customize headers.'));

                $step = $this->step();
                $step = $this->step();

-               if ( 1 == $step )
-                       $this->step_1();
-               elseif ( 2 == $step )
+               if ( 2 == $step )

                        $this->step_2();
                elseif ( 3 == $step )
                        $this->step_3();
                        $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 );
+       }

 }
 }

-?>