diff options
| -rw-r--r-- | wp-admin/admin-functions.php | 6 | ||||
| -rw-r--r-- | wp-admin/custom-header.php | 324 | ||||
| -rw-r--r-- | wp-admin/upload-functions.php | 35 | ||||
| -rw-r--r-- | wp-admin/upload-js.php | 31 | ||||
| -rw-r--r-- | wp-includes/formatting.php | 6 | ||||
| -rw-r--r-- | wp-includes/post-template.php | 70 | ||||
| -rw-r--r-- | wp-includes/post.php | 96 | ||||
| -rw-r--r-- | wp-includes/script-loader.php | 2 | ||||
| -rw-r--r-- | wp-includes/theme.php | 44 |
9 files changed, 541 insertions, 73 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 07e9cc8..ca4a002 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1948,12 +1948,12 @@ function the_attachment_links( $id = false ) { <col class="widefat" /> <tr> <th scope="row"><?php _e( 'URL' ) ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo $post->guid ?></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo wp_get_attachment_url(); ?></textarea></td> </tr> <?php if ( $icon ) : ?> <tr> <th scope="row"><?php $thumb ? _e( 'Thumbnail linked to file' ) : _e( 'Image linked to file' ); ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid; ?>"><?php echo $icon ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $icon ?></a></textarea></td> </tr> <tr> <th scope="row"><?php $thumb ? _e( 'Thumbnail linked to page' ) : _e( 'Image linked to page' ); ?></th> @@ -1962,7 +1962,7 @@ function the_attachment_links( $id = false ) { <?php else : ?> <tr> <th scope="row"><?php _e( 'Link to file' ) ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename( $post->guid ); ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() ); ?></a></textarea></td> </tr> <tr> <th scope="row"><?php _e( 'Link to page' ) ?></th> diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php new file mode 100644 index 0000000..8bdd83d --- /dev/null +++ b/wp-admin/custom-header.php @@ -0,0 +1,324 @@ +<?php + +class Custom_Image_Header { + var $admin_header_callback; + + function Custom_Image_Header($admin_header_callback) { + $this->admin_header_callback = $admin_header_callback; + } + + function init() { + $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page')); + + add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); + add_action("admin_head-$page", array(&$this, 'js'), 50); + add_action("admin_head-$page", $this->admin_header_callback, 51); + } + + function js_includes() { + wp_enqueue_script('cropper'); + wp_enqueue_script('colorpicker'); + } + + function js() { + + if ( isset( $_POST['textcolor'] ) ) { + 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 ( isset($_POST['resetheader']) ) + remove_theme_mods(); + ?> +<script type="text/javascript"> + + function onEndCrop( coords, dimensions ) { + $( 'x1' ).value = coords.x1; + $( 'y1' ).value = coords.y1; + $( 'x2' ).value = coords.x2; + $( 'y2' ).value = coords.y2; + $( 'width' ).value = dimensions.width; + $( 'height' ).value = dimensions.height; + } + + // with a supplied ratio + Event.observe( + window, + 'load', + function() { + var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; + var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; + var ratio = xinit / yinit; + var ximg = $('upload').width; + var yimg = $('upload').height; + if ( yimg < yinit || ximg < xinit ) { + if ( ximg / yimg > ratio ) { + yinit = yimg; + xinit = yinit * ratio; + } else { + xinit = ximg; + yinit = xinit / ratio; + } + } + new Cropper.Img( + 'upload', + { + ratioDim: { x: xinit, y: yinit }, + displayOnInit: true, + onEndCrop: onEndCrop + } + ) + } + ); + + var cp = new ColorPicker(); + + function pickColor(color) { + $('name').style.color = color; + $('desc').style.color = color; + $('textcolor').value = color; + } + function PopupWindow_hidePopup(magicword) { + if ( magicword != 'prettyplease' ) + return false; + if (this.divName != null) { + if (this.use_gebi) { + document.getElementById(this.divName).style.visibility = "hidden"; + } + else if (this.use_css) { + document.all[this.divName].style.visibility = "hidden"; + } + else if (this.use_layers) { + document.layers[this.divName].visibility = "hidden"; + } + } + else { + if (this.popupWindow && !this.popupWindow.closed) { + this.popupWindow.close(); + this.popupWindow = null; + } + } + return false; + } + function colorSelect(t,p) { + if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" ) { + cp.hidePopup('prettyplease'); + } else { + cp.p = p; + cp.select(t,p); + } + } + function colorDefault() { + pickColor('<?php echo HEADER_TEXTCOLOR; ?>'); + } + + function hide_text() { + $('name').style.display = 'none'; + $('desc').style.display = 'none'; + $('pickcolor').style.display = 'none'; + $('defaultcolor').style.display = 'none'; + $('textcolor').value = 'blank'; + $('hidetext').value = '<?php _e('Show Text'); ?>'; +// $('hidetext').onclick = 'show_text()'; + Event.observe( $('hidetext'), 'click', show_text ); + } + + function show_text() { + $('name').style.display = 'block'; + $('desc').style.display = 'block'; + $('pickcolor').style.display = 'inline'; + $('defaultcolor').style.display = 'inline'; + $('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>'; + $('hidetext').value = '<?php _e('Hide Text'); ?>'; + Event.stopObserving( $('hidetext'), 'click', show_text ); + Event.observe( $('hidetext'), 'click', hide_text ); + } + + <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?> +Event.observe( window, 'load', hide_text ); + <?php } ?> + +</script> +<?php + } + + function step_1() { + if ( $_GET['updated'] ) { ?> +<div id="message" class="updated fade"> +<p><?php _e('Header updated.') ?></p> +</div> + <?php } ?> + +<div class="wrap"> +<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> + +<div id="headimg" style="background: url(<?php header_image() ?>) no-repeat;"> +<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> +</div> +<?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?> +<form method="post" action="<?php echo get_option('siteurl') ?>/wp-admin/themes.php?page=custom-header&updated=true"> +<input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" /> +<input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" /> +<input type="hidden" name="textcolor" id="textcolor" value="#<?php header_textcolor() ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?> »" /></form> +<?php } ?> + +<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </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 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" /> +<p class="submit"> +<input type="submit" value="<?php _e('Upload'); ?> »" /> +</p> +</form> + +</div> + + <?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 add_query_arg('step', 1) ?>"> +<input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" /> +</form> +</div> + <?php endif; + + } + + function step_2() { + $overrides = array('test_form' => false); + $file = wp_handle_upload($_FILES['import'], $overrides); + + if ( isset($file['error']) ) + die( $file['error'] ); + + $url = $file['url']; + $file = $file['file']; + $filename = basename($file); + + // Construct the object array + $object = array( + 'post_title' => $filename, + 'post_content' => $url, + 'post_mime_type' => 'import', + 'guid' => $url); + + // Save the data + $id = wp_insert_attachment($object, $file); + + $upload = array('file' => $file, 'id' => $id); + + list($width, $height, $type, $attr) = getimagesize( $file ); + + if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) { + set_theme_mod('header_image', $url); + $header = apply_filters('wp_create_file_in_uploads', $header); // For replication + return $this->finished(); + } elseif ( $width > HEADER_IMAGE_WIDTH ) { + $oitar = $width / HEADER_IMAGE_WIDTH; + $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); + $image = apply_filters('wp_create_file_in_uploads', $image); // For replication + + $url = str_replace(basename($url), basename($image), $url); + $width = $width / $oitar; + $height = $height / $oitar; + } else { + $oitar = 1; + } + ?> + +<div class="wrap"> + +<form method="POST" action="<?php echo 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"> +<img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" /> +</div> + +<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 $id; ?>" /> +<input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" /> +<input type="submit" value="<?php _e('Crop Header »'); ?>" /> +</p> + +</form> +</div> + <?php + } + + function step_3() { + if ( $_POST['oitar'] > 1 ) { + $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; + $_POST['y1'] = $_POST['y1'] * $_POST['oitar']; + $_POST['width'] = $_POST['width'] * $_POST['oitar']; + $_POST['height'] = $_POST['height'] * $_POST['oitar']; + } + + $header = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); + $header = apply_filters('wp_create_file_in_uploads', $header); // For replication + + $parent = get_post($_POST['attachment_id']); + + $parent_url = $parent->guid; + + $url = str_replace(basename($parent_url), basename($header), $parent_url); + + set_theme_mod('header_image', $url); + + // cleanup + $file = get_attached_file( $_POST['attachment_id'] ); + $medium = str_replace(basename($file), 'midsize-'.basename($file), $file); + @unlink( $medium ); + apply_filters( 'wp_delete_file', $medium ); + wp_delete_attachment( $_POST['attachment_id'] ); + + return $this->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 + } + + function admin_page() { + if ( !isset( $_GET['step'] ) ) + $step = 1; + else + $step = (int) $_GET['step']; + + if ( 1 == $step ) { + $this->step_1(); + } elseif ( 2 == $step ) { + $this->step_2(); + } elseif ( 3 == $step ) { + $this->step_3(); + } + + } + +} +?> diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php index 5e6c8c8..ef54c50 100644 --- a/wp-admin/upload-functions.php +++ b/wp-admin/upload-functions.php @@ -13,16 +13,13 @@ function wp_upload_display( $dims = false, $href = '' ) { $class = 'text'; $innerHTML = get_attachment_innerHTML( $id, false, $dims ); - if ( $image_src = strstr($innerHTML, 'src=') ) { - preg_match("/src=(\"|')(.+?)\\1/", $image_src, $matches); - $image_src = $matches[2]; + if ( $image_src = get_attachment_icon_src() ) { $image_rel = wp_make_link_relative($image_src); - $class = 'image'; $innerHTML = ' ' . str_replace($image_src, $image_rel, $innerHTML); - $image_base = str_replace($image_rel, '', $image_src); + $class = 'image'; } - $src_base = get_the_guid(); + $src_base = wp_get_attachment_url(); $src = wp_make_link_relative( $src_base ); $src_base = str_replace($src, '', $src_base); @@ -38,11 +35,16 @@ function wp_upload_display( $dims = false, $href = '' ) { $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n"; $r .= "\t\t\t\t<input type='hidden' name='attachment-url-base-$id' id='attachment-url-base-$id' value='$src_base' />\n"; - if ( isset($attachment_data['thumb']) ) { - $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$image_rel' />\n"; - $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-base-$id' id='attachment-thumb-url-base-$id' value='$image_base' />\n"; - } elseif ( $image_rel ) - $r .= "\t\t\t\t<input type='hidden' name='attachment-is-image-$id' id='attachment-is-image-$id' value='1' />\n"; + if ( !$thumb_base = wp_get_attachment_thumb_url() ) + $thumb_base = wp_mime_type_icon(); + if ( $thumb_base ) { + $thumb_rel = wp_make_link_relative( $thumb_base ); + $thumb_base = str_replace( $thumb_rel, '', $thumb_base ); + $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$thumb_rel' />\n"; + $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-base-$id' id='attachment-thumb-url-base-$id' value='$thumb_base' />\n"; + } + $is_image = (int) wp_attachment_is_image(); + $r .= "\t\t\t\t<input type='hidden' name='attachment-is-image-$id' id='attachment-is-image-$id' value='$is_image' />\n"; if ( isset($width) ) { $r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n"; $r .= "\t\t\t\t<input type='hidden' name='attachment-height-$id' id='attachment-height-$id' value='$height' />\n"; @@ -62,7 +64,7 @@ function wp_upload_view() { <div id="upload-file"> <div id="file-title"> <h2><?php if ( !isset($attachment_data['width']) && 'inline' != $style ) - echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; + echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>"; the_title(); if ( !isset($attachment_data['width']) && 'inline' != $style ) echo '</a>'; @@ -79,7 +81,7 @@ function wp_upload_view() { <div id="upload-file-view" class="alignleft"> <?php if ( isset($attachment_data['width']) && 'inline' != $style ) - echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; + echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>"; echo wp_upload_display( array(171, 128) ); if ( isset($attachment_data['width']) && 'inline' != $style ) echo '</a>'; ?> @@ -102,7 +104,7 @@ function wp_upload_form() { ?> <div id="file-title"> <h2><?php if ( !isset($attachment_data['width']) && 'inline' != $style ) - echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; + echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>"; the_title(); if ( !isset($attachment_data['width']) && 'inline' != $style ) echo '</a>'; @@ -119,7 +121,7 @@ function wp_upload_form() { <div id="upload-file-view" class="alignleft"> <?php if ( isset($attachment_data['width']) && 'inline' != $style ) - echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; + echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>"; echo wp_upload_display( array(171, 128) ); if ( isset($attachment_data['width']) && 'inline' != $style ) echo '</a>'; ?> @@ -129,7 +131,7 @@ function wp_upload_form() { <?php if ( $id ): ?> <tr> <th scope="row"><label for="url"><?php _e('URL'); ?></label></th> - <td><input type="text" id="url" class="readonly" value="<?php the_guid(); ?>" readonly="readonly" /></td> + <td><input type="text" id="url" class="readonly" value="<?php echo wp_get_attachment_url(); ?>" readonly="readonly" /></td> </tr> <?php else : ?> <tr> @@ -343,4 +345,3 @@ function wp_upload_admin_head() { echo "</style>"; } } - diff --git a/wp-admin/upload-js.php b/wp-admin/upload-js.php index e5a65f2..67d7a9e 100644 --- a/wp-admin/upload-js.php +++ b/wp-admin/upload-js.php @@ -37,15 +37,11 @@ addLoadEvent( function() { if ( id == this.currentImage.ID ) return; var thumbEl = $('attachment-thumb-url-' + id); - this.currentImage.isImage = true; if ( thumbEl ) { this.currentImage.thumb = ( 0 == id ? '' : thumbEl.value ); this.currentImage.thumbBase = ( 0 == id ? '' : $('attachment-thumb-url-base-' + id).value ); } else { this.currentImage.thumb = false; - var isImageEl = $('attachment-is-image-' + id); - if ( !isImageEl ) - this.currentImage.isImage = false; } this.currentImage.src = ( 0 == id ? '' : $('attachment-url-' + id).value ); this.currentImage.srcBase = ( 0 == id ? '' : $('attachment-url-base-' + id).value ); @@ -60,6 +56,7 @@ addLoadEvent( function() { this.currentImage.width = false; this.currentImage.height = false; } + this.currentImage.isImage = ( 0 == id ? '' : $('attachment-is-image-' + id).value ); this.currentImage.ID = id; }, @@ -96,10 +93,22 @@ addLoadEvent( function() { h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>"; h += "<table>"; - if ( this.currentImage.thumb ) { + var display = []; + var checked = 'display-title'; + if ( 1 == this.currentImage.isImage ) { + checked = 'display-full'; + if ( this.currentImage.thumb ) { + display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Thumbnail')); ?></label><br />"); + checked = 'display-thumb'; + } + display.push("<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo attribute_escape(__('Full size')); ?></label>"); + } else if ( this.currentImage.thumb ) { + display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Icon')); ?></label>"); + } + if ( display.length ) { + display.push("<br /><label for='display-title'><input type='radio' name='display' id='display-title' value='title' /> <?php echo attribute_escape(__('Title')); ?></label>"); h += "<tr><th style='padding-bottom:.5em'><?php echo attribute_escape(__('Show:')); ?></th><td style='padding-bottom:.5em'>"; - h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> <?php echo attribute_escape(__('Thumbnail')); ?></label><br />"; - h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo attribute_escape(__('Full size')); ?></label>"; + $A(display).each( function(i) { h += i; } ); h += "</td></tr>"; } @@ -117,6 +126,10 @@ addLoadEvent( function() { h += "</div>"; new Insertion.Top('upload-content', h); + var displayEl = $(checked); + if ( displayEl ) + displayEl.checked = true; + if (e) Event.stop(e); return false; }, @@ -144,7 +157,7 @@ addLoadEvent( function() { else h += "<h2>" + this.currentImage.title + "</h2>"; h += " — <span>"; - h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'><?php attribute_escape(__('Insert')); ?></a>" + h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'><?php echo attribute_escape(__('Insert')); ?></a>" h += "</span>"; h += '</div>' h += "<div id='upload-file-view' class='alignleft'>"; @@ -222,7 +235,7 @@ addLoadEvent( function() { if ( 'none' != link ) h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID ) ) + "' title='" + this.currentImage.title + "'>"; - if ( display ) + if ( display && 'title' != display ) h += "<img src='" + ( 'thumb' == display ? ( this.currentImage.thumbBase + this.currentImage.thumb ) : ( this.currentImage.srcBase + this.currentImage.src ) ) + "' alt='" + this.currentImage.title + "' />"; else h += this.currentImage.title; diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 963992d..d1ec74c 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1067,7 +1067,7 @@ function wp_richedit_pre($text) { return apply_filters('richedit_pre', $output); } -function clean_url( $url ) { +function clean_url( $url, $protocols = null ) { if ('' == $url) return $url; $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%]|i', '', $url); $strip = array('%0d', '%0a'); @@ -1075,6 +1075,10 @@ function clean_url( $url ) { $url = str_replace(';//', '://', $url); $url = (!strstr($url, '://')) ? 'http://'.$url : $url; $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); + if ( !is_array($protocols) ) + $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet'); + if ( wp_kses_bad_protocol( $url, $protocols ) != $url ) + return ''; return $url; } diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 101c9b6..443f0c6 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -331,71 +331,57 @@ function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false) $id = (int) $id; $_post = & get_post($id); - if ( ('attachment' != $_post->post_type) || ('' == $_post->guid) ) + if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url() ) return __('Missing Attachment'); $post_title = attribute_escape($_post->post_title); - if (! empty($_post->guid) ) { - $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims); - - return "<a href='$_post->guid' title='$post_title'>$innerHTML</a>"; - - } else { - $p .= __('Missing Attachment'); - } - return $p; + $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims); + return "<a href='$url' title='$post_title'>$innerHTML</a>"; } -function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) { +function get_attachment_icon_src( $id = 0, $fullsize = false ) { $id = (int) $id; - $post = & get_post($id); - - $mime = $post->post_mime_type; + if ( !$post = & get_post($id) ) + return false; $imagedata = wp_get_attachment_metadata( $post->ID ); $file = get_attached_file( $post->ID ); - $exts = array('jpg', 'gif', 'png'); - if ( !$fullsize && !empty($imagedata['thumb']) - && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) - && file_exists($thumbfile) ) { - + if ( !$fullsize && $thumbfile = wp_get_attachment_thumb_file( $post->ID ) ) { // We have a thumbnail desired, specified and existing - $src = str_replace(basename($post->guid), $imagedata['thumb'], $post->guid); + $src = wp_get_attachment_thumb_url( $post->ID ); $src_file = $thumbfile; $class = 'attachmentthumb'; - - } elseif ( ( substr($mime, 0, 6) == 'image/' || 'import' == $mime && in_array(substr($file, -3), $exts) ) - && file_exists($file) ) { - + } elseif ( wp_attachment_is_image( $post->ID ) ) { // We have an image without a thumbnail - $src = $post->guid; + $src = wp_get_attachment_url( $post->ID ); $src_file = & $file; $class = 'attachmentimage'; - } elseif (! empty($mime) ) { - + } elseif ( $src = wp_mime_type_icon( $post->ID ) ) { // No thumb, no image. We'll look for a mime-related icon instead. - $icon_dir = apply_filters('icon_dir', get_template_directory().'/images'); - $icon_dir_uri = apply_filters('icon_dir_uri', get_template_directory_uri().'/images'); - - $types = array(substr($mime, 0, strpos($mime, '/')), substr($mime, strpos($mime, '/') + 1), str_replace('/', '_', $mime)); - foreach ($types as $type) { - foreach ($exts as $ext) { - $src_file = "$icon_dir/$type.$ext"; - if ( file_exists($src_file) ) { - $src = "$icon_dir_uri/$type.$ext"; - break 2; - } - } - } + + $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); + $src_file = $icon_dir . '/' . basename($src); } - if (! isset($src) ) + if ( !isset($src) ) return false; + return array($src, $src_file); +} + +function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) { + $id = (int) $id; + if ( !$post = & get_post($id) ) + return false; + + if ( !$src = get_attachment_icon_src( $id, $fullsize ) ) + return false; + + list($src, $src_file) = $src; // Do we need to constrain the image? if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) { @@ -424,7 +410,7 @@ function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) { $icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>"; - return apply_filters('attachment_icon', $icon, $post->ID); + return apply_filters( 'attachment_icon', $icon, $post->ID ); } function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) { diff --git a/wp-includes/post.php b/wp-includes/post.php index d0fd6df..144b4b6 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1412,6 +1412,7 @@ function wp_get_attachment_metadata( $post_id, $unfiltered = false ) { } function wp_update_attachment_metadata( $post_id, $data ) { + $post_id = (int) $post_id; if ( !get_post( $post_id ) ) return false; @@ -1425,6 +1426,101 @@ function wp_update_attachment_metadata( $post_id, $data ) { return add_post_meta( $post_id, '_wp_attachment_metadata', $data ); } +function wp_get_attachment_url( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$post =& get_post( $post_id ) ) + return false; + + $url = get_the_guid( $post_id ); + + if ( 'attachment' != $post->post_type || !$url ) + return false; + + return apply_filters( 'wp_get_attachment_url', $url, $post_id ); +} + +function wp_get_attachment_thumb_file( $post_id ) { + $post_id = (int) $post_id; + if ( !$imagedata = wp_get_attachment_metadata( $post_id ) ) + return false; + + $file = get_attached_file( $post_id ); + + if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) + return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post_id ); + return false; +} + +function wp_get_attachment_thumb_url( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$url = wp_get_attachment_url( $post_id ) ) + return false; + + if ( !$thumb = wp_get_attachment_thumb_file( $post_id ) ) + return false; + return false; + + $url = str_replace(basename($url), basename($thumb), $url); + + return apply_filters( 'wp_get_attachment_thumb_url', $url, $post_id ); +} + +function wp_attachment_is_image( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$post =& get_post( $post_id ) ) + return false; + + if ( !$file = get_attached_file( $post->ID ) ) + return false; + + $ext = preg_match('/\.([^.]+)$/', $file, $matches) ? strtolower($matches[1]) : false; + + $image_exts = array('jpg', 'jpeg', 'gif', 'png'); + + if ( 'image/' == substr($post->post_mime_type, 0, 6) || $ext && 'import' == $post->post_mime_type && in_array($ext, $image_exts) ) + return true; + return false; +} + +function wp_mime_type_icon( $mime = 0 ) { + $post_id = 0; + if ( is_numeric($mime) ) { + $mime = (int) $mime; + if ( !$post =& get_post( $mime ) ) + return false; + $post_id = $post->ID; + $mime = $post->post_mime_type; + } + + if ( empty($mime) ) + return false; + + $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); + $icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' ); + + $types = array( + substr($mime, 0, strpos($mime, '/')), + substr($mime, strpos($mime, '/') + 1), + str_replace('/', '_', $mime) + ); + + $exts = array('jpg', 'gif', 'png'); + + $src = false; + + foreach ( $types as $type ) { + foreach ( $exts as $ext ) { + $src_file = "$icon_dir/$type.$ext"; + if ( file_exists($src_file) ) { + $src = "$icon_dir_uri/$type.$ext"; + break 2; + } + } + } + + return apply_filters( 'wp_mime_type_icon', $src, $mime, $post_id ); // Last arg is 0 if function pass mime type. +} + function wp_check_for_changed_slugs($post_id) { if ( !strlen($_POST['wp-old-slug']) ) return $post_id; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 1836899..cc6c7aa 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -35,7 +35,7 @@ class WP_Scripts { $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' ); $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' ); $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); - $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '4535' ); + $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20061223' ); } } diff --git a/wp-includes/theme.php b/wp-includes/theme.php index ca1ae60..f527b42 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -455,10 +455,54 @@ function set_theme_mod($name, $value) { wp_cache_delete("mods_$theme", 'options'); } +function remove_theme_mod( $name ) { + $theme = get_current_theme(); + + $mods = get_option("mods_$theme"); + + if ( !isset($mods[$name]) ) + return; + + unset($mods[$name]); + + if ( empty($mods) ) + return remove_theme_mods(); + + update_option("mods_$theme", $mods); + wp_cache_delete("mods_$theme", 'options'); +} + function remove_theme_mods() { $theme = get_current_theme(); delete_option("mods_$theme"); } +function get_header_textcolor() { + return get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); +} + +function header_textcolor() { + echo get_header_textcolor(); +} + +function get_header_image() { + return get_theme_mod('header_image', HEADER_IMAGE); +} + +function header_image() { + echo get_header_image(); +} + +function add_custom_image_header($header_callback, $admin_header_callback) { + if ( ! empty($header_callback) ) + add_action('wp_head', $header_callback); + + if ( ! is_admin() ) + return; + require_once(ABSPATH . 'wp-admin/custom-header.php'); + $GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback); + add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init')); +} + ?> |