Ticket #13231: refactoring_custom_header.patch
File refactoring_custom_header.patch, 30.0 KB (added by , 15 years ago) |
---|
-
wp-admin/css/wp-admin.dev.css
3708 3708 } 3709 3709 3710 3710 /* Custom Header */ 3711 .appearance_page_custom-header #headimg, .appearance_page_custom-header img#upload { 3712 border: 1px solid #000; 3713 } 3711 3714 3712 table#available-headers td { 3713 padding: 0 20px 10px 0; 3715 .appearance_page_custom-header #headimg h1 { 3716 font-family: 'Trebuchet MS', 'Lucida Grande', Verdana,Arial, Sans-Serif; 3717 font-size: 2em; 3718 font-weight: bold; 3719 margin: 0; 3720 padding-top: 70px; 3721 text-align: center; 3714 3722 } 3715 table#available-headers label input { 3716 margin-right: 8px; 3723 3724 .appearance_page_custom-header td p label { 3725 margin-right: 10px; 3717 3726 } 3718 table#available-headers label img { 3727 3728 .appearance_page_custom-header #uploadForm p label { 3729 font-size: 11px; 3730 } 3731 3732 .appearance_page_custom-header #headimg #desc { 3733 font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; 3734 font-size: 0.8em; 3735 text-align: center; 3736 } 3737 3738 .appearance_page_custom-header table#available-headers td { 3739 padding: 0 20px 20px 0; 3740 } 3741 .appearance_page_custom-header table#available-headers label input { 3742 margin-right: 10px; 3743 } 3744 .appearance_page_custom-header table#available-headers label img { 3719 3745 vertical-align: middle; 3720 3746 } 3721 3747 -
wp-admin/custom-header.php
50 50 * @param callback $admin_image_div_callback Optional custom image div output callback. 51 51 * @return Custom_Image_Header 52 52 */ 53 function Custom_Image_Header( $admin_header_callback, $admin_image_div_callback = '') {53 function Custom_Image_Header( $admin_header_callback, $admin_image_div_callback = '' ) { 54 54 $this->admin_header_callback = $admin_header_callback; 55 55 $this->admin_image_div_callback = $admin_image_div_callback; 56 56 } … … 61 61 * @since 2.1.0 62 62 */ 63 63 function init() { 64 if ( ! current_user_can( 'switch_themes') )64 if ( ! current_user_can( 'edit_theme_options' ) ) 65 65 return; 66 66 67 $page = add_theme_page( __('Header'), __('Header'), 'switch_themes', 'custom-header', array(&$this, 'admin_page'));67 $page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( &$this, 'admin_page' ) ); 68 68 69 add_action( "admin_print_scripts-$page", array(&$this, 'js_includes'));70 add_action( "admin_print_styles-$page", array(&$this, 'css_includes'));71 add_action( "admin_head-$page", array(&$this, 'take_action'), 50);72 add_action( "admin_head-$page", array(&$this, 'js'), 50);73 add_action( "admin_head-$page", $this->admin_header_callback, 51);69 add_action( "admin_print_scripts-$page", array( &$this, 'js_includes' ) ); 70 add_action( "admin_print_styles-$page", array( &$this, 'css_includes' ) ); 71 add_action( "admin_head-$page", array( &$this, 'take_action' ), 50 ); 72 add_action( "admin_head-$page", array( &$this, 'js' ), 50 ); 73 add_action( "admin_head-$page", $this->admin_header_callback, 51) ; 74 74 } 75 75 76 76 /** … … 99 99 function js_includes() { 100 100 $step = $this->step(); 101 101 102 if ( 1 == $step)102 if ( ( 1 == $step || 3 == $step ) && NO_HEADER_TEXT != 1 ) 103 103 wp_enqueue_script('farbtastic'); 104 104 elseif ( 2 == $step ) 105 wp_enqueue_script(' jcrop');105 wp_enqueue_script('imgareaselect'); 106 106 } 107 107 108 108 /** … … 113 113 function css_includes() { 114 114 $step = $this->step(); 115 115 116 if ( 1 == $step)116 if ( ( 1 == $step || 3 == $step ) && NO_HEADER_TEXT != 1 ) 117 117 wp_enqueue_style('farbtastic'); 118 118 elseif ( 2 == $step ) 119 wp_enqueue_style(' jcrop');119 wp_enqueue_style('imgareaselect'); 120 120 } 121 121 122 122 /** … … 125 125 * @since 2.6.0 126 126 */ 127 127 function take_action() { 128 if ( ! current_user_can(' switch_themes') )128 if ( ! current_user_can('edit_theme_options') ) 129 129 return; 130 131 if ( empty($_POST) ) 132 return; 133 134 if ( isset($_POST['resetheader']) ) { 135 check_admin_referer('custom-header'); 136 remove_theme_mod('header_image'); 137 return; 138 } 139 140 if ( isset($_POST['resettext']) ) { 141 check_admin_referer('custom-header'); 142 remove_theme_mod('header_textcolor'); 143 return; 144 } 130 145 131 if ( isset( $_POST['text color'] ) ) {146 if ( isset( $_POST['text-color'] ) ) { 132 147 check_admin_referer('custom-header'); 133 if ( 'blank' == $_POST['text color'] ) {148 if ( 'blank' == $_POST['text-color'] ) { 134 149 set_theme_mod('header_textcolor', 'blank'); 135 150 } else { 136 $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text color']);151 $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']); 137 152 if ( strlen($color) == 6 || strlen($color) == 3 ) 138 153 set_theme_mod('header_textcolor', $color); 139 154 } 140 155 } 141 156 142 if ( isset($_POST['resetheader']) ) {143 check_admin_referer('custom-header');144 remove_theme_mods();145 }146 147 157 if ( isset($_POST['default-header']) ) { 148 158 check_admin_referer('custom-header'); 149 159 $this->process_default_headers(); 150 160 if ( isset($this->default_headers[$_POST['default-header']]) ) 151 161 set_theme_mod('header_image', esc_url($this->default_headers[$_POST['default-header']]['url'])); 152 162 } 163 164 $this->updated = true; 153 165 } 154 166 155 167 /** … … 221 233 */ 222 234 function js() { 223 235 $step = $this->step(); 224 if ( 1 == $step)236 if ( ( 1 == $step || 3 == $step ) && NO_HEADER_TEXT != 1 ) 225 237 $this->js_1(); 226 238 elseif ( 2 == $step ) 227 239 $this->js_2(); 228 240 } 229 241 230 242 /** 231 * Display Javascript based on Step 1 .243 * Display Javascript based on Step 1 and 3. 232 244 * 233 245 * @since 2.6.0 234 246 */ 235 247 function js_1() { ?> 236 248 <script type="text/javascript"> 237 var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor'];249 var text_objects = ['#name', '#desc', '#text-color-row']; 238 250 var farbtastic; 251 var default_color = '#<?php echo HEADER_TEXTCOLOR; ?>'; 252 var old_color = null; 239 253 240 254 function pickColor(color) { 241 255 jQuery('#name').css('color', color); 242 256 jQuery('#desc').css('color', color); 243 jQuery('#text color').val(color);257 jQuery('#text-color').val(color); 244 258 farbtastic.setColor(color); 245 259 } 260 261 function toggle_text(s) { 262 if (jQuery(s).attr('id') == 'showtext' && jQuery('#text-color').val() != 'blank') 263 return; 264 265 if (jQuery(s).attr('id') == 'hidetext' && jQuery('#text-color').val() == 'blank') 266 return; 246 267 268 if (jQuery('#text-color').val() == 'blank') { 269 //Show text 270 if (old_color == '#blank') 271 old_color = default_color; 272 273 jQuery( text_objects.toString() ).show(); 274 jQuery('#text-color').val(old_color); 275 jQuery('#name').css('color', old_color); 276 jQuery('#desc').css('color', old_color); 277 pickColor(old_color); 278 } else { 279 //Hide text 280 jQuery( text_objects.toString() ).hide(); 281 old_color = jQuery('#text-color').val(); 282 jQuery('#text-color').val('blank'); 283 } 284 } 285 247 286 jQuery(document).ready(function() { 248 287 jQuery('#pickcolor').click(function() { 249 288 jQuery('#colorPickerDiv').show(); 250 289 }); 251 290 252 jQuery(' #hidetext').click(function() {253 toggle_text( );291 jQuery('input[name="hidetext"]').click(function() { 292 toggle_text(this); 254 293 }); 294 295 jQuery('#defaultcolor').click(function() { 296 pickColor(default_color); 297 jQuery('#text-color').val(default_color) 298 }); 299 300 jQuery('#text-color').keyup(function() { 301 var _hex = jQuery('#text-color').val(); 302 var hex = _hex; 303 if ( hex[0] != '#' ) 304 hex = '#' + hex; 305 hex = hex.replace(/[^#a-fA-F0-9]+/, ''); 306 if ( hex != _hex ) 307 jQuery('#text-color').val(hex); 308 if ( hex.length == 4 || hex.length == 7 ) 309 pickColor( hex ); 310 }); 311 312 jQuery(document).mousedown(function(){ 313 jQuery('#colorPickerDiv').each( function() { 314 var display = jQuery(this).css('display'); 315 if (display == 'block') 316 jQuery(this).fadeOut(2); 317 }); 318 }); 255 319 256 farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); }); 257 pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>'); 320 farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { 321 pickColor(color); 322 }); 323 pickColor('#<?php echo get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?>'); 258 324 259 <?php if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR) ) { ?>325 <?php if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || defined( 'NO_HEADER_TEXT' ) ) { ?> 260 326 toggle_text(); 261 327 <?php } ?> 262 });263 264 jQuery(document).mousedown(function(){265 // Make the picker disappear, since we're using it in an independant div266 hide_picker();267 });268 269 function colorDefault() {270 pickColor('#<?php echo HEADER_TEXTCOLOR; ?>');271 }272 273 function hide_picker(what) {274 var update = false;275 jQuery('#colorPickerDiv').each(function(){276 var id = jQuery(this).attr('id');277 if (id == what) {278 return;279 }280 var display = jQuery(this).css('display');281 if (display == 'block') {282 jQuery(this).fadeOut(2);283 }284 328 }); 285 }286 287 function toggle_text(force) {288 if (jQuery('#textcolor').val() == 'blank') {289 //Show text290 jQuery( buttons.toString() ).show();291 jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');292 jQuery('#hidetext').val('<?php _e('Hide Text'); ?>');293 }294 else {295 //Hide text296 jQuery( buttons.toString() ).hide();297 jQuery('#textcolor').val('blank');298 jQuery('#hidetext').val('<?php _e('Show Text'); ?>');299 }300 }301 302 303 304 329 </script> 305 330 <?php 306 331 } … … 313 338 function js_2() { ?> 314 339 <script type="text/javascript"> 315 340 function onEndCrop( coords ) { 316 jQuery( '#x1' ).val(coords.x); 317 jQuery( '#y1' ).val(coords.y); 318 jQuery( '#x2' ).val(coords.x2); 319 jQuery( '#y2' ).val(coords.y2); 320 jQuery( '#width' ).val(coords.w); 321 jQuery( '#height' ).val(coords.h); 341 jQuery('#x1').val(coords.x); 342 jQuery('#y1').val(coords.y); 343 jQuery('#width').val(coords.w); 344 jQuery('#height').val(coords.h); 322 345 } 323 346 324 // with a supplied ratio325 347 jQuery(document).ready(function() { 326 348 var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; 327 349 var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; 328 var ratio = xinit /yinit;350 var ratio = xinit + ':' + yinit; 329 351 var ximg = jQuery('#upload').width(); 330 352 var yimg = jQuery('#upload').height(); 331 353 332 //set up default values 333 jQuery( '#x1' ).val(0); 334 jQuery( '#y1' ).val(0); 335 jQuery( '#x2' ).val(xinit); 336 jQuery( '#y2' ).val(yinit); 337 jQuery( '#width' ).val(xinit); 338 jQuery( '#height' ).val(yinit); 339 340 if ( yimg < yinit || ximg < xinit ) { 341 if ( ximg / yimg > ratio ) { 342 yinit = yimg; 343 xinit = yinit * ratio; 344 } else { 345 xinit = ximg; 346 yinit = xinit / ratio; 347 } 348 } 349 350 jQuery('#upload').Jcrop({ 354 jQuery('#upload').imgAreaSelect({ 355 handles: true, 356 keys: true, 351 357 aspectRatio: ratio, 352 setSelect: [ 0, 0, xinit, yinit ], 353 onSelect: onEndCrop 358 maxHeight: <?php echo HEADER_IMAGE_HEIGHT; ?>, 359 maxWidth: <?php echo HEADER_IMAGE_WIDTH; ?>, 360 onSelectChange: function(img, c) { 361 jQuery('#x1').val(c.x1); 362 jQuery('#y1').val(c.y1); 363 jQuery('#width').val(c.width); 364 jQuery('#height').val(c.height); 365 }, 354 366 }); 355 367 }); 356 368 </script> … … 368 380 369 381 <div class="wrap"> 370 382 <?php screen_icon(); ?> 371 <h2><?php _e( 'Your Header Image'); ?></h2>383 <h2><?php _e( 'Custom Header' ); ?></h2> 372 384 373 <?php 374 if ( isset($_GET['updated']) && $_GET['updated'] ) { ?> 385 <?php if ( ! empty( $this->updated ) ) { ?> 375 386 <div id="message" class="updated"> 376 <p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>387 <p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url() ); ?></p> 377 388 </div> 378 <?php } 389 <?php } ?> 379 390 380 if ( get_theme_mod('header_image') || empty($this->default_headers) ) : 381 ?> 382 <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p> 383 <?php 391 <h3><?php _e( 'Header Image' ) ?></h3> 392 <table class="form-table"> 393 <tbody> 384 394 385 if ( $this->admin_image_div_callback ) { 386 call_user_func($this->admin_image_div_callback); 387 } else { 388 ?> 389 <div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);"> 390 <h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1> 391 <div id="desc"><?php bloginfo('description');?></div> 392 </div> 393 <?php } ?> 395 <?php if ( get_header_image() ) { ?> 396 <tr valign="top"> 397 <th scope="row"><?php _e( 'Current Image' ); ?></th> 398 <td> 399 <?php if ( $this->admin_image_div_callback ) { 400 call_user_func( $this->admin_image_div_callback ); 401 } else { 402 ?> 403 <div id="headimg" style="background-image: url(<?php esc_url ( header_image() ) ?>);color:#<?php echo get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?>"> 404 <?php 405 $style = ''; 406 if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || defined( 'NO_HEADER_TEXT' ) ) 407 $style = " style='display:none'"; 408 ?> 409 <h1 id="name"<?php echo $style; ?>><?php bloginfo( 'name' ); ?></h1> 410 <div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> 411 </div> 412 <?php } ?> 413 </td> 414 </tr> 415 <?php } ?> 394 416 395 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?> 396 <form method="post" action="<?php echo admin_url('themes.php?page=custom-header&updated=true') ?>"> 397 <input type="button" class="button" value="<?php esc_attr_e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" /> 398 <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" /> 399 <?php wp_nonce_field('custom-header'); ?> 400 <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> 401 <?php } ?> 417 <tr valign="top"> 418 <th scope="row"><?php _e( 'Upload Image' ); ?></th> 419 <td> 420 <p><?php _e( 'Here 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 /> 421 <?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> 422 <form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>"> 423 <label><input type="checkbox" value="1" name="transparency"/> <?php _e( 'Retain transparency (If you want to upload a transparent image, you should enable this option.)' ); ?></label> 424 <p> 425 <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br /> 426 <input type="file" id="upload" name="import" /> 427 <input type="hidden" name="action" value="save" /> 428 <?php wp_nonce_field( 'custom-header' ) ?> 429 <input type="submit" class="button" value="<?php esc_attr_e( 'Upload' ); ?>" /> 430 </p> 431 </form> 432 </td> 433 </tr> 434 <form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 1 ) ) ?>"> 435 <?php if ( ! empty( $this->default_headers ) ) { ?> 436 <tr valign="top"> 437 <th scope="row"><?php _e( 'Default Images'); ?></th> 438 <td> 439 <p><?php _e( 'If you didn‘t want to upload your own image, you can use one of these cool headers.' ) ?></p> 440 <?php 441 $this->show_default_header_selector(); 442 ?> 443 </td> 444 </tr> 445 <?php } 402 446 403 <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div> 404 </div> 405 <?php 406 else: 407 echo '<p>' . __('Choose one of these cool headers, or upload your own image below.') . '</p>'; 408 echo '<form method="post" action="' . admin_url('themes.php?page=custom-header&updated=true') . '">'; 409 wp_nonce_field('custom-header'); 410 $this->show_default_header_selector(); 411 echo '<input type="submit" class="button" value="' . esc_attr__('Save Changes') . '" />'; 412 echo '</form>'; 413 echo '</div>'; 414 endif; 415 ?> 416 <div class="wrap"> 417 <h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here 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.'); ?> <?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> 447 if ( get_theme_mod( 'header_image' ) ) { ?> 448 <tr valign="top"> 449 <th scope="row"><?php _e( 'Reset Header Image' ); ?></th> 450 <td> 451 <p><?php _e( 'This will restore the original header image. You will not be able to retrieve any customizations.' ) ?></p> 452 <input type="submit" class="button" name="resetheader" value="<?php esc_attr_e( 'Restore Original Header Image' ); ?>" /> 453 </td> 454 </tr> 455 <?php } ?> 456 </tbody> 457 </table> 418 458 419 <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>"> 420 <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" /> 421 <input type="hidden" name="action" value="save" /> 422 <?php wp_nonce_field('custom-header') ?> 423 <p class="submit"> 424 <input type="submit" value="<?php esc_attr_e('Upload'); ?>" /> 425 </p> 426 </form> 459 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?> 460 <h3><?php _e( 'Header Text' ) ?></h3> 461 <table class="form-table"> 462 <tbody> 463 <tr valign="top" class="hide-if-no-js"> 464 <th scope="row"><?php _e( 'Display Text' ); ?></th> 465 <td> 466 <p> 467 <?php $hidetext = get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?> 468 <label><input type="radio" value="1" name="hidetext" id="hidetext"<?php checked( 'blank' == $hidetext ? true : false ); ?> /> <?php _e( 'No' ); ?></label> 469 <label><input type="radio" value="0" name="hidetext" id="showtext"<?php checked( 'blank' == $hidetext ? false : true ); ?> /> <?php _e( 'Yes' ); ?></label> 470 </p> 471 </td> 472 </tr> 427 473 428 </div> 474 <tr valign="top" id="text-color-row"> 475 <th scope="row"><?php _e( 'Text Color' ); ?></th> 476 <td> 477 <p> 478 <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) ); ?>" /> 479 <span class="description hide-if-js"><?php _e( 'If you want to hide header text, add <strong>#blank</strong> as text color.' );?></span> 480 <input type="button" class="button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color' ); ?>" id="pickcolor" /> 481 <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div> 482 </p> 483 </td> 484 </tr> 429 485 430 <?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?> 431 <div class="wrap"> 432 <h3><?php _e('Reset Header Image and Color'); ?></h3> 433 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>"> 434 <?php 435 wp_nonce_field('custom-header'); 436 if ( !empty($this->default_headers) ) { 437 ?> 438 <p><?php _e('Use one of these cool headers.') ?></p> 439 <?php 440 $this->show_default_header_selector(); 441 ?> 442 <input type="submit" class="button" name="resetheader" value="<?php esc_attr_e('Save Changes'); ?>" /> 443 <?php 444 } else { 445 ?> 446 <p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p> 447 <input type="submit" class="button" name="resetheader" value="<?php esc_attr_e('Restore Original Header'); ?>" /> 448 <?php } ?> 486 <?php if ( defined( 'HEADER_TEXTCOLOR' ) && HEADER_TEXTCOLOR && get_theme_mod( 'header_textcolor' ) != HEADER_TEXTCOLOR ) { ?> 487 <tr valign="top"> 488 <th scope="row"><?php _e( 'Reset Header Text' ); ?></th> 489 <td> 490 <p><?php _e( 'This will restore the original header text. You will not be able to retrieve any customizations.' ) ?></p> 491 <input type="submit" class="button" name="resettext" value="<?php esc_attr_e( 'Restore Original Header Text' ); ?>" /> 492 </td> 493 </tr> 494 <?php } ?> 495 496 </tbody> 497 </table> 498 <?php } 499 500 wp_nonce_field( 'custom-header' ); ?> 501 <p class="submit"><input type="submit" class="button-primary" name="save-header-options" value="<?php esc_attr_e( 'Save Changes' ); ?>" /></p> 449 502 </form> 450 503 </div> 451 <?php endif;452 504 453 505 <?php } 454 506 455 507 /** 456 508 * Display second step of custom header image page. … … 458 510 * @since 2.1.0 459 511 */ 460 512 function step_2() { 461 check_admin_referer('custom-header'); 462 $overrides = array('test_form' => false); 463 $file = wp_handle_upload($_FILES['import'], $overrides); 513 check_admin_referer( 'custom-header' ); 464 514 465 if ( isset($file['error']) )466 die( $file['error']);515 $overrides = array( 'test_form' => false ); 516 $file = wp_handle_upload( $_FILES['import'], $overrides ); 467 517 518 if ( isset( $file['error'] ) ) 519 wp_die( $file['error'], __( 'Image Upload Error' ) ); 520 468 521 $url = $file['url']; 469 522 $type = $file['type']; 470 523 $file = $file['file']; … … 472 525 473 526 // Construct the object array 474 527 $object = array( 475 'post_title' => $filename, 476 'post_content' => $url, 477 'post_mime_type' => $type, 478 'guid' => $url); 528 'post_title' => $filename, 529 'post_content' => __( 'This is your header image, if you delete it, you will lost your header image.' ), 530 'post_mime_type' => $type, 531 'guid' => $url 532 ); 479 533 480 534 // Save the data 481 $id = wp_insert_attachment( $object, $file);535 $id = wp_insert_attachment( $object, $file ); 482 536 483 list( $width, $height, $type, $attr) = getimagesize( $file );537 list( $width, $height, $type, $attr ) = getimagesize( $file ); 484 538 485 539 if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) { 486 540 // Add the meta-data 487 541 wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); 488 542 489 set_theme_mod( 'header_image', esc_url($url));490 do_action( 'wp_create_file_in_uploads', $file, $id); // For replication543 set_theme_mod( 'header_image', esc_url( $url ) ); 544 do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication 491 545 return $this->finished(); 492 546 } elseif ( $width > HEADER_IMAGE_WIDTH ) { 493 547 $oitar = $width / HEADER_IMAGE_WIDTH; 494 $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); 548 $transparency = ( isset( $_POST['transparency'] ) && 1 == $_POST['transparency'] ) ? true : false; 549 $image = wp_crop_image( $file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace( basename( $file ), 'midsize-'.basename( $file ), $file ), $transparency ); 495 550 if ( is_wp_error( $image ) ) 496 551 wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); 497 552 498 $image = apply_filters( 'wp_create_file_in_uploads', $image, $id); // For replication553 $image = apply_filters( 'wp_create_file_in_uploads', $image, $id ); // For replication 499 554 500 $url = str_replace( basename($url), basename($image), $url);555 $url = str_replace( basename( $url ), basename( $image ), $url ); 501 556 $width = $width / $oitar; 502 557 $height = $height / $oitar; 503 558 } else { 504 559 $oitar = 1; 505 560 } 561 562 // Check for transparency 563 $transparency = 0; 564 if ( isset( $_POST['transparency'] ) && 1 == $_POST['transparency'] ) 565 $transparency = 1; 506 566 ?> 507 567 508 568 <div class="wrap"> 569 <?php screen_icon(); ?> 570 <h2><?php _e( 'Crop Header Image' ); ?></h2> 509 571 510 <form method="POST" action="<?php echo esc_attr(add_query_arg('step', 3)) ?>"> 572 <form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 3 ) ); ?>"> 573 <p class="hide-if-no-js"><?php _e( 'Choose the part of the image you want to use as your header.' ); ?></p> 574 <p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.' ); ?></strong></p> 575 <p><?php printf( __( 'Images smaller then <strong>%1$d x %2$d pixels</strong> will be zoomed.' ), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); ?></p> 576 <div id="crop_image" style="position: relative"> 577 <img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" /> 578 </div> 511 579 512 <p><?php _e('Choose the part of the image you want to use as your header.'); ?></p> 513 <div id="testWrap" style="position: relative"> 514 <img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" /> 515 </div> 516 517 <p class="submit"> 518 <input type="hidden" name="x1" id="x1" /> 519 <input type="hidden" name="y1" id="y1" /> 520 <input type="hidden" name="x2" id="x2" /> 521 <input type="hidden" name="y2" id="y2" /> 522 <input type="hidden" name="width" id="width" /> 523 <input type="hidden" name="height" id="height" /> 524 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($id); ?>" /> 525 <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" /> 526 <?php wp_nonce_field('custom-header') ?> 527 <input type="submit" value="<?php esc_attr_e('Crop Header'); ?>" /> 528 </p> 529 580 <input type="hidden" name="x1" id="x1" value="0"/> 581 <input type="hidden" name="y1" id="y1" value="0"/> 582 <input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/> 583 <input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/> 584 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" /> 585 <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" /> 586 <input type="hidden" name="transparency" id="transparency" value="<?php echo esc_attr( $transparency ); ?>"/> 587 <?php wp_nonce_field( 'custom-header' ) ?> 588 <p class="submit"><input type="submit" value="<?php esc_attr_e( 'Crop Header' ); ?>" /></p> 530 589 </form> 531 590 </div> 532 591 <?php … … 538 597 * @since 2.1.0 539 598 */ 540 599 function step_3() { 541 check_admin_referer('custom-header'); 600 check_admin_referer( 'custom-header' ); 601 542 602 if ( $_POST['oitar'] > 1 ) { 543 603 $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; 544 604 $_POST['y1'] = $_POST['y1'] * $_POST['oitar']; … … 546 606 $_POST['height'] = $_POST['height'] * $_POST['oitar']; 547 607 } 548 608 609 $transparency = ( isset( $_POST['transparency'] ) && 1 == $_POST['transparency'] ) ? true : false; 610 549 611 $original = get_attached_file( $_POST['attachment_id'] ); 550 612 551 $cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); 613 // Crop the image 614 $cropped = wp_crop_image( $_POST['attachment_id'], $x1, $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, false, false, $transparency ); 552 615 if ( is_wp_error( $cropped ) ) 553 wp_die( __( 'Image could not be processed. 616 wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); 554 617 555 $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication618 $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $_POST['attachment_id'] ); // For replication 556 619 557 $parent = get_post( $_POST['attachment_id']);620 $parent = get_post( $_POST['attachment_id'] ); 558 621 $parent_url = $parent->guid; 559 $url = str_replace( basename($parent_url), basename($cropped), $parent_url);622 $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url ); 560 623 561 624 // Construct the object array 562 625 $object = array( 563 626 'ID' => $_POST['attachment_id'], 564 'post_title' => basename( $cropped),565 'post_content' => $url,627 'post_title' => basename( $cropped ), 628 'post_content' => __( 'This is your header image, if you delete it, you will lost your header image.' ), 566 629 'post_mime_type' => 'image/jpeg', 567 630 'guid' => $url 568 631 ); 569 632 570 633 // Update the attachment 571 wp_insert_attachment( $object, $cropped);634 wp_insert_attachment( $object, $cropped ); 572 635 wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) ); 573 636 574 set_theme_mod( 'header_image', $url);637 set_theme_mod( 'header_image', $url ); 575 638 576 639 // cleanup 577 $medium = str_replace( basename($original), 'midsize-'.basename($original), $original);640 $medium = str_replace( basename( $original ), 'midsize-'.basename( $original ), $original ); 578 641 @unlink( apply_filters( 'wp_delete_file', $medium ) ); 579 642 @unlink( apply_filters( 'wp_delete_file', $original ) ); 580 643 … … 587 650 * @since 2.1.0 588 651 */ 589 652 function finished() { 590 $ _GET['updated'] = 1;591 653 $this->updated = true; 654 $this->step_1(); 592 655 } 593 656 594 657 /** … … 597 660 * @since 2.1.0 598 661 */ 599 662 function admin_page() { 600 if ( ! current_user_can('switch_themes') ) 601 wp_die(__('You do not have permission to customize headers.')); 663 if ( ! current_user_can( 'edit_theme_options' ) ) 664 wp_die( __( 'You do not have permission to customize headers.' ) ); 665 602 666 $step = $this->step(); 603 667 if ( 1 == $step ) 604 668 $this->step_1(); -
wp-admin/includes/image.php
41 41 * @param int $dst_h The destination height. 42 42 * @param int $src_abs Optional. If the source crop points are absolute. 43 43 * @param string $dst_file Optional. The destination file to write to. 44 * @param bool $dst_transparency Optional. The destination file type. Transparency = PNG. 44 45 * @return string|WP_Error|false New filepath on success, WP_Error or false on failure. 45 46 */ 46 function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {47 function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false, $dst_transparency = false ) { 47 48 if ( is_numeric( $src_file ) ) // Handle int as attachment ID 48 49 $src_file = get_attached_file( $src_file ); 49 50 … … 63 64 imageantialias( $dst, true ); 64 65 65 66 imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ); 66 67 67 imagedestroy( $src ); // Free up memory 68 68 69 69 if ( ! $dst_file ) 70 70 $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file ); 71 71 72 $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file ); 72 $type = '.jpeg'; 73 if ( $dst_transparency ) 74 $type = '.png'; 73 75 74 if ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) ) 76 $dst_file = preg_replace( '/\\.[^\\.]+$/', $type, $dst_file ); 77 78 if ( $dst_transparency && imagepng( $dst, $dst_file) ) 75 79 return $dst_file; 80 elseif ( imagejpeg( $dst, $dst_file) ) 81 return $dst_file; 76 82 else 77 83 return false; 78 84 }