Changeset 5110

Timestamp:

03/26/2007 07:28:29 AM (18 years ago)

Author:

matt

Message:

A backend interface for tagging.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (4 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/upgrade-schema.php (modified) (2 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/post.php (modified) (5 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -648 +648 @@
 function return_categories_list( $parent = 0 ) {
     global $wpdb;
-    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( link_count = 0 OR category_count != 0 OR ( link_count = 0 AND category_count = 0 ) ) ORDER BY category_count DESC" );
+    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( ( link_count = 0 AND tag_count = 0 ) OR category_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 ) ) ORDER BY category_count DESC" );
 }
 
@@ -658 +658 @@
 }
 
+function get_tags_to_edit( $post_id ) {
+    global $wpdb;
+
+    $post_id = (int) $post_id;
+    if ( !$post_id )
+        return false;
+
+    $tags = $wpdb->get_results( "
+             SELECT category_id, cat_name
+             FROM $wpdb->categories, $wpdb->post2cat
+             WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_id' AND rel_type = 'tag'
+             " );
+    if ( !$tags )
+        return false;
+
+    foreach ( $tags as $tag )
+        $tag_names[] = $tag->cat_name;
+    $tags_to_edit = join( ', ', $tag_names );
+    $tags_to_edit = attribute_escape( $tags_to_edit );
+    $tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
+    return $tags_to_edit;
+}
+
 function get_nested_categories( $default = 0, $parent = 0 ) {
     global $post_ID, $link_id, $mode, $wpdb;
@@ -665 +688 @@
              SELECT category_id
              FROM $wpdb->categories, $wpdb->post2cat
-             WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
+             WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' AND rel_type = 'category'
              " );
 
@@ -722 +745 @@
 function return_link_categories_list( $parent = 0 ) {
     global $wpdb;
-    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( category_count = 0  OR link_count != 0 OR ( link_count = 0 AND category_count = 0 ) ) ORDER BY link_count DESC" );
+    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( ( category_count = 0 AND tag_count = 0 ) OR link_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 ) ) ORDER BY link_count DESC" );
 }
 

trunk/wp-admin/edit-form-advanced.php

@@ -153 +153 @@
 <?php echo $form_prevstatus ?>
 
+<div class="tagdiv"><p>Enter tags (keywords) that you feel describe this post separated by commas: (ex: dogs, san francisco, cats.)<br />
+<input type="text" name="tags_input" id="tags_input" size="30" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" />
+</p></div>
 
 <p class="submit">

trunk/wp-admin/upgrade-schema.php

@@ -19 +19 @@
   category_count bigint(20) NOT NULL default '0',
   link_count bigint(20) NOT NULL default '0',
+  tag_count bigint(20) NOT NULL default '0',
   posts_private tinyint(1) NOT NULL default '0',
   links_private tinyint(1) NOT NULL default '0',
@@ -89 +90 @@
   post_id bigint(20) NOT NULL default '0',
   category_id bigint(20) NOT NULL default '0',
+  rel_type varchar(64) NOT NULL default 'category',
   PRIMARY KEY  (rel_id),
   KEY post_id (post_id,category_id)

trunk/wp-admin/wp-admin.css

@@ -559 +559 @@
 }
 
-#titlediv input, #guiddiv input {
+#titlediv input, #guiddiv input, #tags_input {
     margin: 0;
     width: 100%;

trunk/wp-includes/post.php

@@ -518 +518 @@
         $comment_status  = apply_filters('comment_status_pre', $comment_status);
         $ping_status     = apply_filters('ping_status_pre',    $ping_status);
+        $tags_input      = apply_filters('tags_input_pre',     $tags_input);
     }
 
@@ -652 +653 @@
     }
 
-    wp_set_post_categories($post_ID, $post_category);
+    wp_set_post_categories( $post_ID, $post_category );
+    wp_set_post_tags( $post_ID, $tags_input );
 
     if ( 'page' == $post_type ) {
@@ -770 +772 @@
 }
 
+function wp_set_post_tags( $post_id = 0, $tags = '' ) {
+    global $wpdb;
+    
+    $post_id = (int) $post_id;
+    
+    if ( !$post_id )
+        return false;
+
+    $tags = explode( ',', $tags );
+    foreach ( $tags as $tag ) {
+        $tag = trim( $tag );
+        if ( !$tag_slug = sanitize_title( $tag ) )
+            continue; // discard
+        if ( !$tag_id = category_exists( $tag ) )
+            $tag_id = wp_create_category( $tag );
+        $tag_ids[] = $tag_id;
+    }
+
+    $tag_ids = array_unique( $tag_ids );
+
+    // First the old tags
+    $old_tags = $wpdb->get_col("
+        SELECT category_id
+        FROM $wpdb->post2cat
+        WHERE post_id = '$post_id' AND rel_type = 'tag'");
+
+    if ( !$old_tags ) {
+        $old_tags = array();
+    } else {
+        $old_tags = array_unique( $old_tags );
+    }
+
+    // Delete any?
+    $delete_tags = array_diff( $old_tags, $tag_ids);
+    if ( $delete_tags ) {
+        foreach ( $delete_tags as $del ) {
+            $wpdb->query("
+                DELETE FROM $wpdb->post2cat
+                WHERE category_id = '$del'
+                    AND post_id = '$post_id'
+                    AND rel_type = 'tag'
+                ");
+        }
+    }
+
+    // Add any?
+    $add_tags = array_diff( $tag_ids, $old_tags );
+    if ( $add_tags ) {
+        foreach ( $add_tags as $new_tag ) {
+            $new_tag = (int) $new_tag;
+            if ( !empty($new_tag) )
+                $wpdb->query("
+                    INSERT INTO $wpdb->post2cat (post_id, category_id, rel_type) 
+                    VALUES ('$post_id', '$new_tag', 'tag')");
+        }
+    }
+
+    // Update category counts.
+    $all_affected_tags = array_unique( array_merge( $tag_ids, $old_tags ) );
+    foreach ( $all_affected_tags as $tag_id ) {
+        $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$tag_id' AND rel_type = 'tag'" );
+        $wpdb->query( "UPDATE $wpdb->categories SET tag_count = '$count' WHERE cat_ID = '$tag_id'" );
+        if ( $count == 0 )
+            $wpdb->query( "UPDATE $wpdb->categories SET tag_count = '-1' WHERE cat_ID = '$tag_id'" );
+        clean_category_cache( $tag_id );
+        do_action( 'edit_category', $tag_id );
+        do_action( 'edit_tag', $tag_id );
+    }
+}
+
 function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
     global $wpdb;
@@ -784 +856 @@
         SELECT category_id
         FROM $wpdb->post2cat
-        WHERE post_id = '$post_ID'");
+        WHERE post_id = '$post_ID' AND rel_type = 'category'");
 
     if (!$old_categories) {
@@ -821 +893 @@
     $all_affected_cats = array_unique(array_merge($post_categories, $old_categories));
     foreach ( $all_affected_cats as $cat_id ) {
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id'");
+        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id' AND rel_type = 'category'");
         $wpdb->query("UPDATE $wpdb->categories SET category_count = '$count' WHERE cat_ID = '$cat_id'");
         clean_category_cache($cat_id);

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.2-bleeding';
-$wp_db_version = 4860;
+$wp_db_version = 4865;
 
 ?>