Changeset 3303

Timestamp:

12/13/05 19:19:56 (3 years ago)

Author:

ryan

Message:

Attachment enhancements from skeltoac. fixes #2074

Files:

• trunk/wp-admin/admin-functions.php (modified) (8 diffs)
• trunk/wp-admin/edit-pages.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/inline-uploading.php (modified) (15 diffs)
• trunk/wp-admin/post.php (modified) (4 diffs)
• trunk/wp-admin/wp-admin.css (modified) (5 diffs)
• trunk/wp-content/themes/default/attachment.php (modified) (1 diff)
• trunk/wp-content/themes/default/images/audio.jpg (added)
• trunk/wp-content/themes/default/style.css (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (4 diffs)
• trunk/wp-includes/functions-post.php (modified) (6 diffs)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/template-functions-links.php (modified) (1 diff)
• trunk/wp-includes/template-functions-post.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -743 +743 @@
-            @ imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]);
-
+            // If no filters change the filename, we'll do a default transformation.
+            if ( basename($file) == $thumb = apply_filters('thumbnail_filename', basename($file)) )
+                $thumb = preg_replace('!(\.[^.]+)?$!', __('.thumbnail').'$1', basename($file), 1);
+
+            $thumbpath = str_replace(basename($file), $thumb, $file);
+
-            // move the thumbnail to it's final destination
-
-            $path = explode('/', $file);
-            $thumbpath = substr($file, 0, strrpos($file, '/')).'/thumb-'.$path[count($path) - 1];
-
-            if ($type[2] == 1) {
-                if (!imagegif($thumbnail, $thumbpath)) {
@@ -772 +774 @@
-        return $error;
-    } else {
-1
+$thumbpath
-    }
-}
@@ -1634 +1636 @@
-function wp_handle_upload(&$file, $overrides = false) {
-    // The default error handler.
-
-
+
+
+
+
-    }
-
@@ -1654 +1658 @@
-
-    // Accepted MIME types are set here as PCRE. Override with $override['mimes'].
-
-   'image/jpeg'    =>  'jpg|jpeg|jpe
-   'image/gif' =>  '
-   'image/(png|x-png)' =>  '
-   'image/(bmp|x-bmp|x-ms-bmp)'    =>  '
-   'image/(tiff|x-tiff)'   =>  'tif|
-   'image/(ico|x-ico)' =>  'ico
-   'video/(asf|x-asf|x-ms-asf)'    =>  'asf|asx|wma|wax|wmv|wmx
-   'video/(wmv|x-wmv|x-ms-wmv)'    =>  'wmv
-   'video/(msvideo|x-msvideo)' =>  'avi
-   'video/(quicktime|x-quicktime)' =>  'mov|qt
-   'video/(mpeg|x-mpeg)'   =>  'mpeg|mpg|mpe
-   'text/plain'    =>  'txt|c|cc|h|php
-   'text/richtext' =>  'rtx
-   'text/css'  =>  'css
-   'text/html' =>  'htm|html
-   'text/javascript'   =>  'js
-   'audio/(mpeg|x-mpeg|mpeg3|x-mpeg3)' =>  'mp3
-   'audio/x-realaudio' =>  'ra|ram
-   'audio/(wav|x-wav)' =>  'wav
-   'audio/(ogg|x-ogg)' =>  'ogg
-   'audio/(midi|x-midi)'   =>  'mid|midi
-   'application/pdf'   =>  'pdf
-   'application/msword'    =>  'doc
-   'application/mspowerpoint'  =>  'pot|pps|ppt
-   'application/mswrite'   =>  'wri
-   'application/(msexcel|vnd.ms-excel)'    =>  'xla|xls|xlt|xlw
-   'application/msaccess'  =>  'mdb
-   'application/msproject' =>  'mpp
-   'application/x-shockwave-flash' =>  'swf
-   'application/java'  =>  'class
-   'application/x-tar' =>  'tar
-   'application/(zip|x-zip-compressed)'    =>  'zip
-   'application/(x-gzip|x-gzip-compressed)'    =>  'gz|gzip'));
-
-// For security, we never trust HTTP Content-Type headers unless the user overrides this.
-$trust_content_type = false
+ 
+'jpg|jpeg|jpe' => 'image/jpeg
+'gif' => 'image/
+'png' => 'image/
+'bmp' => 'image/
+'tif|tiff' => 'image/
+'ico' => 'image/x-icon
+'asf|asx|wax|wmv|wmx' => 'video/asf
+'avi' => 'video/avi
+'mov|qt' => 'video/quicktime
+'mpeg|mpg|mpe' => 'video/mpeg
+'txt|c|cc|h|php' => 'text/plain
+'rtx' => 'text/richtext
+'css' => 'text/css
+'htm|html' => 'text/html
+'mp3|mp4' => 'audio/mpeg
+'ra|ram' => 'audio/x-realaudio
+'wav' => 'audio/wav
+'ogg' => 'audio/ogg
+'mid|midi' => 'audio/midi
+'wma' => 'audio/wma
+'rtf' => 'application/rtf
+'js' => 'application/javascript
+'pdf' => 'application/pdf
+'doc' => 'application/msword
+'pot|pps|ppt' => 'application/vnd.ms-powerpoint
+'wri' => 'application/vnd.ms-write
+'xla|xls|xlt|xlw' => 'application/vnd.ms-excel
+'mdb' => 'application/vnd.ms-access
+'mpp' => 'application/vnd.ms-project
+'swf' => 'application/x-shockwave-flash
+'class' => 'application/java
+'tar' => 'application/x-tar
+'zip' => 'application/zip',
+
+   'exe' => 'application/x-msdownload'
+))
-
-    // All tests are on by default. Most can be turned off by $override[{test_name}] = false;
-    $test_form = true;
-    $test_size = true;
+
+    // If you override this, you must provide $ext and $type!!!!
-    $test_type = true;
-
@@ -1717 +1723 @@
-        return $upload_error_handler($file, __('Specified file failed upload test.'));
-
- We can't always determine it programatically, so we'll trust the HTTP headers.
+
-    if ( $test_type ) {
-        $type = false;
-        $ext = false;
-
-
+
-            $ext_preg = '![^.]\.(' . $ext_preg . ')$!i';
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            return $upload_error_handler($file, __('File type does not meet security guidelines. Try another.'));
-        $type = $type[0];
-        $ext = $ext[1];
-    }
-
@@ -1755 +1756 @@
-    $new_file = $uploads['path'] . "/$filename";
-    if ( false === move_uploaded_file($file['tmp_name'], $new_file) )
-__('The uploaded file could not be moved to $file.'
+printf(__('The uploaded file could not be moved to %s.'), $file['path']
-
-    // Set correct file permissions
@@ -1765 +1766 @@
-    $url = $uploads['url'] . "/$filename";
-
-
+, 'type' => $type
-}
-
@@ -1837 +1838 @@
-}
-
+function the_attachment_links($id = false) {
+    $id = (int) $id;
+    $post = & get_post($id);
+
+    if ( $post->post_status != 'attachment' )
+        return false;
+
+    $icon = get_attachment_icon($post->ID);
+
-?>
+<?php _e('Text linked to file') ?><br/>
+<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>
+<?php _e('Text linked to subpost') ?><br/>
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea>
+<?php if ( $icon ) : ?>
+<?php _e('Thumbnail linked to file') ?><br/>
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><img src="<?php echo $thumb ?>" class="attachmentthumb" alt="<?php echo $post->post_title ?>" /></a></textarea>
+<?php _e('Thumbnail linked to subpost') ?><br/>
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" class="attachmentlink"><img src="<?php echo $icon ?>" class="attachmentthumb" alt="<?php echo $post->post_title ?>" /></a></textarea>
+<?php endif; ?>
+<?php
+}
+
+function get_udims($width, $height) {
+    if ( $height <= 96 && $width <= 128 )
+        return array($width, $height);
+    elseif ( $width / $height > 4 / 3 )
+        return array(128, (int) ($height / $width * 128));
+    else
+        return array((int) ($width / $height * 96), 96);
+}
+
+?>

trunk/wp-admin/edit-pages.php

@@ -10 +10 @@
-<p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page'); ?> &raquo;</a></p>
-
+<form name="searchform" action="" method="get"> 
+  <fieldset> 
+  <legend><?php _e('Search Pages&hellip;') ?></legend>
+  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" /> 
+  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
+  </fieldset>
+</form>
+
-<?php
-
+
+
+
+
+
+
+
-
-if ($posts) {
@@ -25 +39 @@
-    <th scope="col"></th> 
-  </tr> 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</table> 
-

trunk/wp-admin/edit.php

@@ -66 +66 @@
-    printf(__('Search for “%s”'), wp_specialchars($_GET['s']) );
-} else {
-
+
+
+
-        _e('Last 15 Posts');
-    else

trunk/wp-admin/inline-uploading.php

@@ -26 +26 @@
-$images_width = 1;
-
-function get_udims($width, $height) {
-    if ( $height <= 96 && $width <= 128 )
-        return array($width, $height);
-    elseif ( $width / $height > 4 / 3 )
-        return array(128, (int) ($height / $width * 128));
-    else
-        return array((int) ($width / $height * 96), 96);
-}
-
-switch($action) {
-case 'delete':
@@ -56 +47 @@
-
-$url = $file['url'];
+$type = $file['type'];
-$file = $file['file'];
-$filename = basename($file);
@@ -65 +57 @@
-    'post_status' => 'attachment',
-    'post_parent' => $post,
-_FILES['image']['type']
+type
-    'guid' => $url
-    );
@@ -80 +72 @@
-    $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
-    $imagedata['file'] = $file;
-    $imagedata['thumb'] = "thumb-$filename";
-
-    add_post_meta($id, '_wp_attachment_metadata', $imagedata);
@@ -86 +77 @@
-    if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
-        if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
-error
+thumb
-        elseif ( $imagedata['height'] > 96 )
-
+
+
+
+
+
+
+
+
+
-    }
-} else {
@@ -163 +162 @@
-    $__using_thumbnail = __('Using Thumbnail');
-    $__using_original = __('Using Original');
+    $__using_title = __('Using Title');
+    $__using_filename = __('Using Filename');
+    $__using_icon = __('Using Icon');
-    $__no_thumbnail = '<del>'.__('No Thumbnail').'</del>';
-    $__send_to_editor = __('Send to editor');
@@ -174 +176 @@
-usingthumbnail = '$__using_thumbnail';
-usingoriginal = '$__using_original';
+usingtitle = '$__using_title';
+usingfilename = '$__using_filename';
+usingicon = '$__using_icon';
-var aa = new Array();
-var ab = new Array();
@@ -180 +185 @@
-var srca = new Array();
-var srcb = new Array();
+var title = new Array();
+var filename = new Array();
+var icon = new Array();
-";
-    foreach ( $attachments as $key => $attachment ) {
@@ -194 +202 @@
-        $attachment = array_merge($attachment, $meta);
-        $send_delete_cancel = "<a onclick=\"sendToEditor({$ID});return false;\" href=\"javascript:void()\">$__send_to_editor</a>
-a onclick=\"return confirm('$__confirmdelete')\" href=\"".basename(__FILE__)."?action=delete&amp;attachment={$ID}&amp;all=$all&amp;start=$start&amp;post=$post\">$__delete</a
+!--<a onclick=\"return confirm('$__confirmdelete')\" href=\"".basename(__FILE__)."?action=delete&amp;attachment={$ID}&amp;all=$all&amp;start=$start&amp;post=$post\">$__delete</a>--
-        <a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>
-";
@@ -235 +243 @@
-";
-        } else {
-
-
+
+
+
+
+
+
+
+
+
-";
-            $html .= "<div id='target{$ID}' class='attwrap left'>
-
+ usingtext
-        <a id=\"{$ID}\" href=\"{$attachment['guid']}\" onmousedown=\"selectLink({$ID});\" onclick=\"return false;\">{$attachment['post_title']}</a>
-    </div>
@@ -247 +262 @@
-    <div class='filetype'>".__('File Type:').' '.str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
-    <a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
+    {$toggle_icon}
-    {$send_delete_cancel}
-</div>
@@ -321 +337 @@
-    od=document.getElementById('div'+n);
-    ol=document.getElementById('L'+n);
+    oi=document.getElementById(n);
+    ih=oi.innerHTML;
-    if ( ol.innerHTML == linkedtofile ) {
-        od.innerHTML = aa[n];
@@ -328 +346 @@
-        ol.innerHTML = linkedtofile;
-    }
+    oi=document.getElementById(n);
+    oi.innerHTML = ih;
-}
-function toggleImage(n) {
@@ -339 +359 @@
-        oi.innerHTML = usingthumbnail;
-    }
+}
+function toggleOtherIcon(n) {
+    od = document.getElementById('div'+n);
+    o = document.getElementById(n);
+    oi = document.getElementById('I'+n);
+    if ( oi.innerHTML == usingtitle ) {
+        o.innerHTML = filename[n];
+        oi.innerHTML = usingfilename;
+    } else if ( oi.innerHTML == usingfilename ) {
+        o.innerHTML = icon[n];
+        oi.innerHTML = usingicon;
+    } else {
+        o.innerHTML = title[n];
+        oi.innerHTML = usingtitle;
+    }
+    if ( oi.innerHTML == usingicon )
+        od.className = 'otherwrap usingicon';
+    else
+        od.classname = 'otherwrap usingtext';
-}
-
@@ -402 +441 @@
-.otherwrap {
-    margin-right: 5px;
-    height: 90px;
-    overflow: hidden;
-    background-color: #f9fcfe;
-    float: left;
-    padding: 3px;
-}
-.otherwrap a {
-    display: block;
-    width: 122px;
-}
-.otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited {
-    color: blue;
+}
+.usingicon {
+    padding: 0px;
+    height: 96px;
+    text-align: center;
+}
+.usingicon a {
+    width: 128px;
+}
+.usingtext {
+    padding: 3px;
+    height: 90px;
+    text-align: left;
+}
+.usingtext a {
+    width: 122px;
-}
-.filetype {

trunk/wp-admin/post.php

@@ -75 +75 @@
-    if ($post->post_status == 'static')
-        include('edit-page-form.php');
+    elseif ($post->post_status == 'attachment')
+        include('edit-attachment-form.php');
-    else
-        include('edit-form-advanced.php');
@@ -85 +87 @@
-    <?php
-    break;
+
+case 'editattachment':
+    $post_id = (int) $_POST['post_ID'];
+
+    // Don't let these be changed
+    unset($_POST['guid']);
+    $_POST['post_status'] = 'attachment';
+
+    // Update the thumbnail filename
+    $oldmeta = $newmeta = get_post_meta($post_id, '_wp_attachment_metadata', true);
+    $newmeta['thumb'] = $_POST['thumb'];
+
+    if ( '' !== $oldmeta )
+        update_post_meta($post_id, '_wp_attachment_metadata', $newmeta, $oldmeta);
+    else
+        add_post_meta($post_id, '_wp_attachment_metadata', $newmeta);
-
-case 'editpost':
@@ -99 +117 @@
-        if ( $_POST['referredby'] == 'redo' )
-            $location = get_permalink( $post_ID );
+    } elseif ($action == 'editattachment') {
+        $location = 'attachments.php';
-    } else {
-        $location = 'post.php';
@@ -111 +131 @@
-
-    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+
+    $post = & get_post($post_id);
-    
-    if ( !current_user_can('edit_post', $post_id) ) 
-        die( __('You are not allowed to delete this post.') );
-
-! wp_delete_pos
+ (($post->post_status != 'attachment') && !wp_delete_post($post_id)) || !wp_delete_attachmen
-        die( __('Error in deleting...') );
-
-    $sendback = $_SERVER['HTTP_REFERER'];
-    if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
+    elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
-    $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
-    header ('Location: ' . $sendback);

trunk/wp-admin/wp-admin.css

@@ -162 +162 @@
-    width: 100%;
-    overflow-y: hidden;
+}
+
+form#upload th {
+    text-align: right;
+}
+
+form#upload #post_content, form#upload #post_title {
+    width: 250px;
+}
+
+form#upload #post_content {
+    height: 50px;
+}
+
+.attpreview {
+    width: 1px; /* hug */
+    text-align: center;
-}
-
@@ -390 +407 @@
-}
-
-
+, #guiddiv
-    margin: 0 8px 0 0;
-    padding: 0px;
@@ -410 +427 @@
-}
-
-
+, #guiddiv input
-    margin: 0px;
-    width: 100%;
@@ -457 +474 @@
-}
-
-
+, #attachmentlinks div
-    margin-right: 8px;
-}
-
-
+
+
+
+
+
+
+
-    padding-right: 8px;
-}
-
-
+, .attachmentlinks
-    margin: 0px;
-    height: 4em;
@@ -734 +757 @@
-}
-
-
+, #thumbdiv input, #parentdiv input
-    margin-top: .5em;
-    width: 90%;

trunk/wp-content/themes/default/attachment.php

@@ -12 +12 @@
-            <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-            <div class="entrytext">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
-    

trunk/wp-content/themes/default/style.css

@@ -264 +264 @@
-    margin: 30px 0;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#footer {
-    padding: 0 0 0 1px;

trunk/wp-includes/classes.php

@@ -98 +98 @@
-            $qv['attachment_id'] = $qv['subpost_id'];
-            
-
+(int) 
-            $this->is_single = true;
-            $this->is_attachment = true;
-
-
-
+
-            $this->is_single = true;
-        } elseif ( $qv['p'] ) {
@@ -116 +114 @@
-        } elseif (!empty($qv['s'])) {
-            $this->is_search = true;
+            switch ($qv['show_post_type']) {
+            case 'page' :
+                $this->is_page = true;
+                break;
+            case 'attachment' :
+                $this->is_attachment = true;
+                break;
+            }
-        } else {
-        // Look for archive queries.  Dates, categories, authors.
@@ -198 +204 @@
-            if ( ($this->is_date || $this->is_author || $this->is_category)) {
-                $this->is_archive = true;
+            }
+
+            if ( 'attachment' == $qv['show_post_type'] ) {
+                $this->is_attachment = true;
-            }
-        }
@@ -1414 +1424 @@
-    var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id');
-
-
+, 'show_post_type'
-
-    var $query_vars;

trunk/wp-includes/functions-post.php

@@ -209 +209 @@
-}
-
-
+ = false
-    global $wpdb, $user_ID;
-
-    if ( is_object($object) )
-        $object = get_object_vars($object);
-
+
-    // Export array as variables
-    extract($object);
@@ -321 +321 @@
-    wp_set_post_cats('', $post_ID, $post_category);
-
-
+
+
-
-    clean_post_cache($post_ID);
@@ -344 +345 @@
-        return false;
-
-image
+_wp_attachment_meta
-    $file = get_post_meta($postid, '_wp_attached_file', true);
-
@@ -355 +356 @@
-    $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $postid");
-
-
-
+
+
+
+
+
-
-    if ( ! empty($file) )
@@ -429 +433 @@
-        $postarr['post_date_gmt'] = '';
-    }
+
+    if ($postarr['post_status'] == 'attachment')
+        return wp_insert_attachment($postarr);
-
-    return wp_insert_post($postarr);
@@ -511 +518 @@
-    if ( !$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = $postid") )
-        return $post;
+
+    if ( 'attachment' == $post->post_status )
+        return wp_delete_attachment($postid);
-
-    do_action('delete_post', $postid);

trunk/wp-includes/functions.php

@@ -504 +504 @@
-    $original_prev = $prev_value;
-    if ( is_array($prev_value) || is_object($prev_value) )
-serialize($value
+$wpdb->escape(serialize($prev_value)
-
-    if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key

trunk/wp-includes/template-functions-links.php

@@ -210 +210 @@
-    get_currentuserinfo();
-
-|| is_attachment() 
+
-        return;
-    }
-
-
+
+
+
+
+
+
-    echo $before . "<a href=\"$location\">$link</a>" . $after;
-}

trunk/wp-includes/template-functions-post.php

@@ -440 +440 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-        $p .= __('Missing attachment');
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $p .= '</p>';
+    $p = apply_filters('prepend_attachment', $p);
-
-    return "$p\n$content";
-}
+
-?>