Changes from branches/3.1/wp-admin/custom-header.php at r18023 to trunk/wp-admin/custom-header.php at r18298

File:

• trunk/wp-admin/custom-header.php (modified) (17 diffs)

trunk/wp-admin/custom-header.php

@@ -43 +43 @@
     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.
@@ -53 +63 @@
 
     /**
-     * PHP4 Constructor - Register administration header callback.
+     * Constructor - Register administration header callback.
      *
      * @since 2.1.0
@@ -60 +70 @@
      * @return Custom_Image_Header
      */
-    function Custom_Image_Header($admin_header_callback, $admin_image_div_callback = '') {
+    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;
@@ -94 +104 @@
         '<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><strong>' . __( 'For more information:' ) . '</strong></p>' .
-        '<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Header_SubPanel" target="_blank">Documentation on Custom Header</a>' ) . '</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>' );
     }
@@ -184 +194 @@
         if ( isset( $_POST['removeheader'] ) ) {
             check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-            set_theme_mod( 'header_image', '' );
+            set_theme_mod( 'header_image', 'remove-header' );
             return;
         }
@@ -200 +210 @@
         }
 
-        if ( isset($_POST['default-header']) ) {
+        if ( isset( $_POST['default-header'] ) ) {
             check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-            $this->process_default_headers();
-            if ( isset($this->default_headers[$_POST['default-header']]) )
-                set_theme_mod('header_image', esc_url($this->default_headers[$_POST['default-header']]['url']));
+            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'] ) );
+            }
         }
     }
@@ -227 +246 @@
             $this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
         }
+
     }
 
@@ -232 +252 @@
      * 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_default_header_selector() {
-        echo '<div id="available-headers">';
-        foreach ( $this->default_headers as $header_key => $header ) {
+    function show_header_selector( $type = 'default' ) {
+        if ( 'default' == $type ) {
+            $headers = $this->default_headers;
+        } else {
+            $headers = get_uploaded_header_images();
+            $type = 'uploaded';
+        }
+
+        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 = $header['description'];
+            $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) . ' />';
-            echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr($header_desc) .'" title="' . esc_attr($header_desc) .'" /></label>';
+            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'] ) )
+                $width = ' width="230"';
+            echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
             echo '</div>';
         }
@@ -348 +389 @@
         toggle_text();
         <?php } ?>
-        });
+    });
+/* ]]> */
 </script>
 <?php
@@ -432 +474 @@
 <?php } ?>
 
-<h3><?php _e( 'Header Image' ) ?></h3>
 <table class="form-table">
 <tbody>
@@ -481 +522 @@
 <table class="form-table">
 <tbody>
-    <?php if ( ! empty( $this->default_headers ) ) : ?>
+    <?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.' ) ?></p>
+    <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.' ) ?>
+    <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_default_header_selector();
+        $this->show_header_selector( 'default' );
     ?>
 </td>
 </tr>
     <?php endif;
-
     if ( get_header_image() ) : ?>
 <tr valign="top">
@@ -507 +558 @@
     <?php endif;
 
-    if ( defined( 'HEADER_IMAGE' ) ) : ?>
+    if ( defined( 'HEADER_IMAGE' ) && '' != HEADER_IMAGE ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>
@@ -520 +571 @@
 
     <?php if ( $this->header_text() ) : ?>
-<h3><?php _e( 'Header Text' ) ?></h3>
 <table class="form-table">
 <tbody>
@@ -607 +657 @@
             // 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' ) );
 
             set_theme_mod('header_image', esc_url($url));
@@ -671 +722 @@
         }
 
-        $original = get_attached_file( $_POST['attachment_id'] );
-
-        $cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
+        $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' ) );
 
-        $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication
-
-        $parent = get_post($_POST['attachment_id']);
+        $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);
@@ -685 +737 @@
         // Construct the object array
         $object = array(
-            'ID' => $_POST['attachment_id'],
+            'ID' => $attachment_id,
             'post_title' => basename($cropped),
             'post_content' => $url,
@@ -695 +747 @@
         // Update the attachment
         wp_insert_attachment($object, $cropped);
-        wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $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);