From 366cfe0d03f1aefb823228f4e1be0f15f373eb21 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 19 Feb 2008 06:13:20 +0000 Subject: [PATCH] Media Library design updates from Andy. see #5911 git-svn-id: http://svn.automattic.com/wordpress/trunk@6910 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-attachment-rows.php | 118 +++++++++++ wp-admin/includes/post.php | 34 ++++ wp-admin/includes/template.php | 15 ++ wp-admin/upload.php | 327 +++++++++++++++++++----------- wp-includes/classes.php | 2 +- wp-includes/post.php | 111 ++++++++++ wp-includes/query.php | 8 +- 7 files changed, 493 insertions(+), 122 deletions(-) create mode 100644 wp-admin/edit-attachment-rows.php diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php new file mode 100644 index 000000000..b8ae190bb --- /dev/null +++ b/wp-admin/edit-attachment-rows.php @@ -0,0 +1,118 @@ + + + + + + + + + + + + + +\n\t\n"; // Hack! +$class = ( $i_post > 15 || 'alternate' == $class) ? '' : 'alternate'; +global $current_user; +$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); +?> + post_status ); ?>' valign="top"> + +$column_display_name) { + + switch($column_name) { + + case 'cb': + ?> + + + + + + post_date && 'date' == $column_name ) { + $t_time = $h_time = __('Unpublished'); + } else { + $t_time = get_the_time(__('Y/m/d g:i:s A')); + $m_time = $post->post_date; + $time = get_post_time(); + if ( ( abs(time() - $time) ) < 86400 ) { + if ( 'future' == get_post_status($post->ID) ) + $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); + else + $h_time = sprintf( __('%s ago'), human_time_diff( $time ) ); + } else { + $h_time = mysql2date(__('Y/m/d'), $m_time); + } + } + ?> + + post_parent); + if ( empty($title) ) + $title = __('(no title)'); + ?> + + + + + + + + + + + + + +
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index e4b54ab67..5147c64e8 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -502,6 +502,8 @@ function wp_edit_posts_query( $q = false ) { 'private' => array(__('Private'), __('Private posts'), __('Private (%s)')) ); + $post_stati = apply_filters('post_stati', $post_stati); + $avail_post_stati = get_available_post_statuses('post'); $post_status_q = ''; @@ -524,6 +526,38 @@ function wp_edit_posts_query( $q = false ) { return array($post_stati, $avail_post_stati); } +function get_available_post_mime_types($type = 'attachment') { + global $wpdb; + + $types = $wpdb->get_col($wpdb->prepare("SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type)); + return $types; +} + +function wp_edit_attachments_query( $q = false ) { + global $wpdb; + if ( false === $q ) + $q = $_GET; + $q['m'] = (int) $q['m']; + $q['cat'] = (int) $q['cat']; + $q['post_type'] = 'attachment'; + $q['post_status'] = 'any'; + $post_mime_types = array( // array( adj, noun ) + 'image' => array(__('Images'), __('Manage Images'), __('Images (%s)')), + 'audio' => array(__('Audio'), __('Manage Audio'), __('Audio (%s)')), + 'video' => array(__('Video'), __('Manage Video'), __('Video (%s)')), + ); + $post_mime_types = apply_filters('post_mime_types', $post_mime_types); + + $avail_post_mime_types = get_available_post_mime_types('attachment'); + + if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) + unset($q['post_mime_type']); + + wp($q); + + return array($post_mime_types, $avail_post_mime_types); +} + function postbox_classes( $id, $page ) { $current_user = wp_get_current_user(); if ( $closed = get_usermeta( $current_user->ID, 'closedpostboxes_'.$page ) ) { diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 88de2845b..39651f874 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -306,6 +306,21 @@ function wp_manage_posts_columns() { return $posts_columns; } +// define the columns to display, the syntax is 'internal name' => 'display name' +function wp_manage_media_columns() { + $posts_columns = array(); + $posts_columns['cb'] = '
'; + $posts_columns['icon'] = ''; + $posts_columns['media'] = _c('Media|media column header'); + $posts_columns['desc'] = _c('Description|media column header'); + $posts_columns['date'] = _c('Date Added|media column header'); + $posts_columns['parent'] = _c('Appears with|media column header'); + $posts_columns['location'] = _c('Location|media column header'); + $posts_columns = apply_filters('manage_media_columns', $posts_columns); + + return $posts_columns; +} + function wp_manage_pages_columns() { $posts_columns = array(); $posts_columns['cb'] = '
'; diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 4a5e5cf9b..18527543e 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -1,138 +1,225 @@ get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment'"); -$post_atts = 0; - -if ( $pid ) { - // 0 => tab display name, 1 => required cap, 2 => function that produces tab content, 3 => total number objects OR array(total, objects per page), 4 => add_query_args - $wp_upload_tabs['upload'] = array(__('Upload'), 'upload_files', 'wp_upload_tab_upload', 0); - if ( $all_atts && $post_atts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = '$post_id'") ) - $wp_upload_tabs['browse'] = array(__('Browse'), 'upload_files', "wp_upload_tab_browse", $action ? 0 : $post_atts); - if ( $post_atts < $all_atts ) - $wp_upload_tabs['browse-all'] = array(__('Browse All'), 'upload_files', 'wp_upload_tab_browse', $action ? 0 : $all_atts); -} else - $wp_upload_tabs['browse-all'] = array(__('Browse All'), 'upload_files', 'wp_upload_tab_browse', $action ? 0 : $all_atts); - - $wp_upload_tabs = array_merge($wp_upload_tabs, apply_filters( 'wp_upload_tabs', array() )); - -if ( !is_callable($wp_upload_tabs[$tab][2]) ) { - $to_tab = isset($wp_upload_tabs['upload']) ? 'upload' : 'browse-all'; - wp_redirect( add_query_arg( 'tab', $to_tab ) ); - exit; -} - -foreach ( $wp_upload_tabs as $t => $tab_array ) { - if ( !current_user_can( $tab_array[1] ) ) { - unset($wp_upload_tabs[$t]); - if ( $tab == $t ) - wp_die(__("You are not allowed to be here")); + if ( $post_del->post_type == 'attachment' ) + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); } + + $sendback = wp_get_referer(); + if (strpos($sendback, 'media.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/media.php'; + $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); + + wp_redirect($sendback); + exit(); +} elseif ( !empty($_GET['_wp_http_referer']) ) { + wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); + exit; } -if ( 'inline' == $style ) : ?> - - > - - -<?php bloginfo('name') ?> › <?php _e('Uploads'); ?> — WordPress - - - - - - -
-

-\n"; -foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the current_user_can check - $href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '', 'paged' => '') ); - if ( isset($tab_array[4]) && is_array($tab_array[4]) ) - $href = add_query_arg( $tab_array[4], $href ); - $_href = clean_url( $href); - $page_links = ''; - $class = 'upload-tab alignleft'; - if ( $tab == $t ) { - $class .= ' current'; - if ( $tab_array[3] ) { - if ( is_array($tab_array[3]) ) { - $total = $tab_array[3][0]; - $per = $tab_array[3][1]; - } else { - $total = $tab_array[3]; - $per = 10; - } - $page_links = paginate_links( array( - 'base' => add_query_arg( 'paged', '%#%' ), - 'format' => '', - 'total' => ceil($total / $per), - 'current' => $paged ? $paged : 1, - 'prev_text' => '«', - 'next_text' => '»' - )); - if ( $page_links ) - $page_links = ": $page_links"; +require_once('admin-header.php'); + +add_filter( 'post_limits', $limit_filter = create_function( '$a', '$b = split(" ",$a); if ( !isset($b[2]) ) return $a; $start = intval(trim($b[1])) / 20 * 15; if ( !is_int($start) ) return $a; return "LIMIT $start, 20";' ) ); +list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query(); +$wp_query->max_num_pages = ceil( $wp_query->found_posts / 15 ); // We grab 20 but only show 15 ( 5 more for ajax extra ) + +if ( !isset( $_GET['paged'] ) ) + $_GET['paged'] = 1; + +?> + +
+ +
+

post_title)); +} else { + $post_mime_type_label = _c('Manage Media|manage media header'); + if ( isset($_GET['post_mime_type']) && in_array( $_GET['post_mime_type'], array_keys($post_mime_types) ) ) + $post_mime_type_label = $post_mime_types[$_GET['post_mime_type']][1]; + if ( $post_listing_pageable && !is_archive() && !is_search() ) + $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_mime_type_label) : sprintf(__('Latest %s'), $post_mime_type_label); + else + $h2_noun = $post_mime_type_label; + // Use $_GET instead of is_ since they can override each other + $h2_author = ''; + $_GET['author'] = (int) $_GET['author']; + if ( $_GET['author'] != 0 ) { + if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion + $h2_author = ' ' . __('by other authors'); + } else { + $author_user = get_userdata( get_query_var( 'author' ) ); + $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); } } - - echo "\t
  • {$tab_array[0]}$page_links
    • \n"; + $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( get_search_query() ) ) : ''; + $h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in “%s”'), single_cat_title('', false) ) : ''; + $h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with “%s”'), single_tag_title('', false) ) : ''; + $h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : ''; + printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month ); } -unset($t, $tab_array, $href, $_href, $page_links, $total, $per, $class); -echo "\n\n"; +?>

    -echo "
    \n"; +
      + $reals ) + foreach ( $reals as $real ) + $num_posts[$type] += $_num_posts[$real]; +foreach ( $post_mime_types as $mime_type => $label ) { + $class = ''; -call_user_func( $wp_upload_tabs[$tab][2] ); + if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) ) + continue; -echo "
    \n"; + if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) + $class = ' class="current"'; -if ( 'inline' != $style ) : - echo "
    "; - include_once('admin-footer.php'); -else : ?> - + $status_links[] = "
  • " . + sprintf($label[2], $num_posts[$mime_type]) . ''; +} +$class = empty($_GET['post_mime_type']) ? ' class="current"' : ''; +$status_links[] = "
  • ".__('All Types').""; +echo implode(' |
    • ', $status_links) . ''; +unset($status_links); +?> + - - - + +

    |

    + + +

    + + +

    + + + +
    + +
    + + add_query_arg( 'paged', '%#%' ), + 'format' => '', + 'total' => ceil($wp_query->found_posts / 15), + 'current' => $_GET['paged'] +)); + +if ( $page_links ) + echo "
    $page_links
    "; +?> + +
    + + +posts WHERE post_type = 'post' ORDER BY post_date DESC"; + +$arc_result = $wpdb->get_results( $arc_query ); + +$month_count = count($arc_result); + +if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> + + + + + +
    + +
    +
    + +
    + + + + + + + +
    + +
    + +$page_links
    "; +?> +
    +
    + +get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date"); + if ($comments) { + // Make sure comments, post, and post_author are cached + update_comment_cache($comments); + $post = get_post($id); + $authordata = get_userdata($post->post_author); + ?> +

    +
      +comment_ID, ++$i ); + } + echo '
    '; + } // end if comments +?> + + + + diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 90108a7bc..80c51ae14 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -3,7 +3,7 @@ class WP { var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots'); - var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id'); + var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type'); var $extra_query_vars = array(); var $query_vars; diff --git a/wp-includes/post.php b/wp-includes/post.php index 93cc19f7b..f302374d1 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -806,6 +806,117 @@ function wp_count_posts( $type = 'post' ) { return (object) $stats; } +/** + * wp_count_attachments() - Count number of attachments + * + * {@internal Missing Long Description}} + * + * @package WordPress + * @subpackage Post + * @since 2.5 + * + * @param string|array $post_mime_type Array or comma-separated list of MIME patterns + * @return array Number of posts for each post_mime_type + */ + +function wp_count_attachments( $mime_type = '' ) { + global $wpdb; + + $and = wp_post_mime_type_where( $mime_type ); + $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' $and GROUP BY post_mime_type", ARRAY_A ); + + $stats = array( ); + foreach( (array) $count as $row ) { + $stats[$row['post_mime_type']] = $row['num_posts']; + } + + return (object) $stats; +} + +/** + * wp_match_mime_type() - Check a MIME-Type against a list + * + * {@internal Missing Long Description}} + * + * @package WordPress + * @subpackage Post + * @since 2.5 + * + * @param string|array $wildcard_mime_types e.g. audio/mpeg or image (same as image/*) or flash (same as *flash*) + * @param string|array $real_mime_types post_mime_type values + * @return array array(wildcard=>array(real types)) + */ +function wp_match_mime_types($wildcard_mime_types, $real_mime_types) { + $matches = array(); + if ( is_string($wildcard_mime_types) ) + $wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types)); + if ( is_string($real_mime_types) ) + $real_mime_types = array_map('trim', explode(',', $real_mime_types)); + $wild = '[-._a-z0-9]*'; + foreach ( (array) $wildcard_mime_types as $type ) { + $type = str_replace('*', $wild, $type); + $patternses[1][$type] = $type; + if ( false === strpos($type, '/') ) { + $patternses[2][$type] = "^$type/$wild$"; + $patternses[3][$type] = "$wild$type$wild"; + } + } + asort($patternses); + foreach ( $patternses as $patterns ) + foreach ( $patterns as $type => $pattern ) + foreach ( (array) $real_mime_types as $real ) + if ( preg_match("#$pattern#", $real) && ( empty($matches[$type]) || false === array_search($real, $matches[$type]) ) ) + $matches[$type][] = $real; + return $matches; +} + +/** + * wp_get_post_mime_type_where() - Convert MIME types into SQL + * + * @package WordPress + * @subpackage Post + * @since 2.5 + * + * @param string|array $mime_types MIME types + * @return string SQL AND clause + */ +function wp_post_mime_type_where($post_mime_types) { + $where = ''; + $wildcards = array('', '%', '%/%'); + if ( is_string($post_mime_types) ) + $post_mime_types = array_map('trim', explode(',', $post_mime_types)); + foreach ( (array) $post_mime_types as $mime_type ) { + $mime_type = preg_replace('/\s/', '', $mime_type); + $slashpos = strpos($mime_type, '/'); + if ( false !== $slashpos ) { + $mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos)); + $mime_subgroup = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1)); + if ( empty($mime_subgroup) ) + $mime_subgroup = '*'; + else + $mime_subgroup = str_replace('/', '', $mime_subgroup); + $mime_pattern = "$mime_group/$mime_subgroup"; + } else { + $mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type); + if ( false === strpos($mime_pattern, '*') ) + $mime_pattern .= '/*'; + } + + $mime_pattern = preg_replace('/\*+/', '%', $mime_pattern); + + if ( in_array( $mime_type, $wildcards ) ) + return ''; + + if ( false !== strpos($mime_pattern, '%') ) + $wheres[] = "post_mime_type LIKE '$mime_pattern'"; + else + $wheres[] = "post_mime_type = '$mime_pattern'"; + } + if ( !empty($wheres) ) + $where = ' AND (' . join(' OR ', $wheres) . ') '; + return $where; +} + /** * wp_delete_post() - Deletes a Post * diff --git a/wp-includes/query.php b/wp-includes/query.php index bfa05e6dd..034d64eef 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -786,6 +786,7 @@ class WP_Query { $distinct = ''; $whichcat = ''; $whichauthor = ''; + $whichmimetype = ''; $where = ''; $limits = ''; $join = ''; @@ -1151,7 +1152,12 @@ class WP_Query { $whichauthor .= ' AND (post_author = '.intval($q['author']).')'; } - $where .= $search.$whichcat.$whichauthor; + // MIME-Type stuff for attachment browsing + + if ( '' != $q['post_mime_type'] ) + $whichmimetype = wp_post_mime_type_where($q['post_mime_type']); + + $where .= $search.$whichcat.$whichauthor.$whichmimetype; if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) ) $q['order'] = 'DESC';