Changeset 6910

Timestamp:

02/19/08 06:13:20 (5 months ago)

Author:

ryan

Message:

Media Library design updates from Andy. see #5911

Files:

• trunk/wp-admin/edit-attachment-rows.php (added)
• trunk/wp-admin/includes/post.php (modified) (2 diffs)
• trunk/wp-admin/includes/template.php (modified) (1 diff)
• trunk/wp-admin/upload.php (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -503 +503 @@
-            );
-
+    $post_stati = apply_filters('post_stati', $post_stati);
+
-    $avail_post_stati = get_available_post_statuses('post');
-
@@ -523 +525 @@
-
-    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);
-}
-

trunk/wp-admin/includes/template.php

@@ -303 +303 @@
-    $posts_columns['status'] = __('Status');
-    $posts_columns = apply_filters('manage_posts_columns', $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'] = '<div style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'posts-filter\'));" /></div>';
+    $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;

trunk/wp-admin/upload.php

@@ -2 +2 @@
-require_once('admin.php');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/wp-includes/classes.php

@@ -4 +4 @@
-    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');
-
-
+, 'post_mime_type'
-    var $extra_query_vars = array();
-

trunk/wp-includes/post.php

@@ -808 +808 @@
-
-/**
+ * 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
- *

trunk/wp-includes/query.php

@@ -787 +787 @@
-        $whichcat = '';
-        $whichauthor = '';
+        $whichmimetype = '';
-        $where = '';
-        $limits = '';
@@ -1152 +1153 @@
-        }
-
-
+
+
+
+
+
+
-
-        if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) )