Ticket #7732: press-this_9-22-08.diff

includes/media.php

@@ -342 +342 @@
 function media_sideload_image($file, $post_id, $desc = null) {
         if (!empty($file) ) {
                 $file_array['name'] = basename($file);
-                $file_array['tmp_name'] = download_url($file);
+                $tmp = download_url($file);
+                $file_array['tmp_name'] = $tmp;
                 $desc = @$desc;
 
+                if ( is_wp_error($tmp) ) {
+                        @unlink($file_array['tmp_name']);
+                        $file_array['tmp_name'] = '';
+                }
+                
                 $id = media_handle_sideload($file_array, $post_id, $desc);
                 $src = $id;
-
+                
                 if ( is_wp_error($id) ) {
                         @unlink($file_array['tmp_name']);
                         return $id;

press-this.php

@@ -248 +248 @@
                                 }
                                 img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
                         }
-                        if (!skip) strtoappend += '<a href="?ajax=photo_thickbox&amp;i=' + img.src + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
+                        if (!skip) strtoappend += '<a href="?ajax=photo_thickbox&amp;i=' + encodeURI(img.src) + '&amp;u=<?php echo $url; ?>&amp;height=400&amp;width=500" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>';
                 }
 
                 function pick(img, desc) {
@@ -257 +257 @@
                                 if(length == 0) length = 1;
                                 jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
                                 jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
-                                append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" class="aligncenter"/></p>');
+                                append_editor("\n\n" + '<p style="text-align: center;"><a href="<?php echo urlencode($url); ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>');
                         }
                         tinyMCE.activeEditor.resizeToContent();
                         return false;
@@ -430 +430 @@
         }
 
         jQuery(document).ready(function() {
+                top.resizeTo(700-screen.width+screen.availWidth,680-screen.height+screen.availHeight);
         jQuery('#photo_button').click(function() { show('photo'); return false; });
                 jQuery('#video_button').click(function() { show('video'); return false; });
                 
@@ -450 +451 @@
 <div id="wphead">
 </div>
 
-<?php
-if ( isset($posted) && intval($posted) ) {
-        $post_ID = intval($posted);
-?>
-<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
-<?php
-}
-?>
 <form action="press-this.php?action=post" method="post">
         <?php wp_nonce_field('press-this') ?>
         <input type="hidden" name="post_type" id="post_type" value="text"/>
         
-        <div id="poststuff">
+        <div id="poststuff">    
         <div id="side-info-column">
                 <div class="sleeve">
                         <h1 id="viewsite"><a class="button" href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
@@ -514 +507 @@
         </div>
         
                 <div class="posting">
+                        <?php
+                        if ( isset($posted) && intval($posted) ) {
+                                $post_ID = intval($posted);
+                        ?>
+                        <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
+                        <?php
+                        }
+                        ?>
+                        
                         <h2 id="title"><label for="post_title"><?php _e('Title') ?></label></h2>
                         <div class="titlewrap">
                                 <input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/>

css/press-this.css

@@ -122 +122 @@
 }
 
 #category-add input {
-        width: 94%;
+        width: 94%;     
+        font-family:Verdana,Arial,Helvetica,sans-serif;
+        font-size:13px;
+        margin:1px;
+        padding:3px;
+        
 }
 
 #category-add select {
-        width: 100%;
+        width: 70%;
+        -x-system-font:none;
+        border-style:solid;
+        border-width:1px;
+        font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
+        font-size:12px;
+        height:2em;
+        line-height:20px;
+        padding:2px;
+        margin: 1px;
+        vertical-align:top;
 }
 
 #category-add input#category-add-sumbit {
@@ -143 +158 @@
         margin: 0;
 }
 
-#categorydiv ul.categorychecklist ul, #linkcategorydiv ul.categorychecklist ul {
+#categorydiv ul.categorychecklist ul {
         margin-left: 18px;
 }
 
 
-#categorydiv div.ui-tabs-panel, #linkcategorydiv div.ui-tabs-panel {
+#categorydiv div.ui-tabs-panel {
+height:150px;
+overflow:auto;
 padding:0.5em 0.9em;
 }
 
@@ -191 +208 @@
 
 #TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}
 #TB_ajaxContent h3{margin-bottom:.25em;}
-.updated{margin:0;margin-left:15px;margin-right:15px;padding:0;max-width:980px;border-width:1px;border-style:solid;max-width:950px;margin-top:1em;margin-bottom:1em;width:66%;}
+.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid; width:99%;}
 .updated p,.error p{margin:0.6em 0;padding:0 0.6em;}
 .updated a,.error a{text-decoration:underline;}
 .updated a{text-decoration:none;padding-bottom:2px;}