Changeset 125

Timestamp:

06/04/2005 11:27:38 PM (21 years ago)

Author:

mdawaffe

Message:

Ability to Merge Tags. Clean up tag removal and destruction. Fixes #73.

Location:

trunk

Files:

• bb-admin/tag-destroy.php (modified) (1 diff)
• bb-admin/tag-merge.php (added)
• bb-includes/formatting-functions.php (modified) (1 diff)
• bb-includes/functions.php (modified) (5 diffs)
• bb-includes/template-functions.php (modified) (1 diff)
• bb-templates/tag-single.php (modified) (1 diff)

trunk/bb-admin/tag-destroy.php

@@ -13 +13 @@
     die('Tag not found.');
 
-if ( $destroyed = destroy_tag( $tag_id ) )
-    header('Location: ' . $bb->path );
-else
-    die("Something odd happened when attempting to destroy that tag.  Error code: $destroyed.  <a href=\"" . $_SERVER['HTTP_REFERER'] . '">Try Again</a>');
+if ( $destroyed = destroy_tag( $tag_id ) ) {
+    echo 'Rows deleted from tags table: ' . $destroyed['tags'] . "<br />\n";
+    echo 'Rows deleted from tagged table: ' . $destroyed['tagged'] . "<br />\n";
+    echo 'Destruction Successful? ' . ($destroyed['destroyed']) ? "TRUE\n" : "FALSE<br />\n
+        \t NOTE: destruction of a tag that is not associated with any posts will give a false negative.<br />\n";
+    echo '<a href="'. $bb->path . '">Home</a>';
+} else {
+    var_dump($destroyed);
+    die("<br />Something odd happened when attempting to destroy that tag.  See the above Error codes.<br />\n<a href=\"" . $_SERVER['HTTP_REFERER'] . '">Try Again?</a>');
+}
 ?>

trunk/bb-includes/formatting-functions.php

@@ -117 +117 @@
 }
 
+function tag_sanitize( $tag ) {
+    $tag    = trim         ( $tag );
+    $tag    = strtolower   ( $tag );
+    $tag    = preg_replace ( '/\s/', '', $tag );
+    $tag    = user_sanitize( $tag );
+    return $tag;
+}
+
 function show_context( $term, $text ) {
     $text = strip_tags($text);

trunk/bb-includes/functions.php

@@ -658 +658 @@
     global $bbdb;
     $raw_tag = $tag;
-    $tag     = trim         ( $tag );
-    $tag     = strtolower   ( $tag );
-    $tag     = preg_replace ( '/\s/', '', $tag );
-    $tag     = user_sanitize( $tag );
+    $tag     = tag_sanitize( $tag );
     if ( empty( $tag ) )
         return false;
@@ -677 +674 @@
         return false;
     $raw_tag = $tag;
-    $tag     = trim         ( $tag );
-    $tag     = strtolower   ( $tag );
-    $tag     = preg_replace ( '/\s/', '', $tag );
-    $tag     = user_sanitize( $tag );
+    $tag     = tag_sanitize( $tag ); 
 
     if ( empty( $tag ) )
@@ -705 +699 @@
     bb_do_action('bb_tag_removed', $tagged);
 
-    if ( $removed = $bbdb->query("DELETE FROM $bbdb->tagged WHERE tag_id = '$tag_id' AND user_id = '$user_id' AND topic_id = '$topic_id'") );
-        $removed += $bbdb->query("UPDATE $bbdb->tags SET tag_count = tag_count - 1 WHERE tag_id = '$tag_id'");
-    $removed *= 10;
+    if ( $tags = $bbdb->query("DELETE FROM $bbdb->tagged WHERE tag_id = '$tag_id' AND user_id = '$user_id' AND topic_id = '$topic_id'") );
+        $tagged = $bbdb->query("UPDATE $bbdb->tags SET tag_count = tag_count - 1 WHERE tag_id = '$tag_id'");
     if ( !$bbdb->get_var("SELECT tag_id FROM $bbdb->tagged WHERE tag_id = '$tag_id' LIMIT 1") ) // don't trust tag_count?
-        $removed += destroy_tag( $tag_id );
-    return $removed; // debugging: 2_ normally, 1_ if didn't update count, 0_ if didn't delete from tagged
+        $destroyed = destroy_tag( $tag_id );
+    return array( 'removed' => ($tags && $tagged), 'tags' => $tags, 'tagged' => $tagged, 'destroyed' => $destroyed );
+}
+
+// merge $old_id into $new_id.  MySQL 4.0 can't do IN on tuples!
+function merge_tags( $old_id, $new_id ) {
+    global $bbdb, $current_user;
+    if ( $current_user->user_type < 2)
+        return false;
+    if ( $old_id == $new_id )
+        return false;
+
+    $merged_tags = serialize( array( 'old_id' => $old_id, 'new_id' => $new_id ) );
+
+    bb_do_action('bb_tag_merged', $merged_tags);
+
+    $tagged_del = 0;
+    if ( $old_topic_ids = $bbdb->get_col( "SELECT topic_id FROM $bbdb->tagged WHERE tag_id = '$old_id'" ) ) {
+        $old_topic_ids = join(',', $old_topic_ids);
+        $shared_query = "SELECT user_id, topic_id FROM $bbdb->tagged WHERE tag_id = '$new_id' AND topic_id IN ($old_topic_ids)";
+    $shared_topics = $bbdb->get_results( $shared_query );
+    $shared_count = count($shared_topics);
+    foreach ( $shared_topics as $shared_topic )
+        $tagged_del += $bbdb->query( "DELETE FROM $bbdb->tagged WHERE tag_id = '$old_id' AND user_id = '$shared_topic->user_id' AND topic_id = '$shared_topic->topic_id'" );
+    }
+
+    if ( $diff_count = $bbdb->query( "UPDATE $bbdb->tagged SET tag_id = '$new_id' WHERE tag_id = '$old_id'" ) )
+        $bbdb->query( "UPDATE $bbdb->tags SET tag_count = tag_count + $diff_count WHERE tag_id = '$new_id'" );
+
+    // return values and destroy the old tag
+    return array( 'destroyed' => destroy_tag( $old_id ), 'old_count' => $diff_count + $shared_count, 'diff_count' => $diff_count );
 }
 
@@ -720 +742 @@
     bb_do_action('bb_tag_destroyed', $tag_id);
 
-    if ( $destroyed = $bbdb->query("DELETE FROM $bbdb->tags WHERE tag_id = '$tag_id'") )
-        $destroyed += $bbdb->query("DELETE FROM $bbdb->tagged WHERE tag_id = '$tag_id'");
-    return $destroyed; // debugging: 2 normally, 1 if didn't delete from tagged, 0 if didn't delete from tags
+    if ( $tags = $bbdb->query("DELETE FROM $bbdb->tags WHERE tag_id = '$tag_id'") )
+        $tagged = $bbdb->query("DELETE FROM $bbdb->tagged WHERE tag_id = '$tag_id'");
+    return array( 'destroyed' => ($tags && $tagged), 'tags' => $tags, 'tagged' => $tagged );
 }
 
 function get_tag_id( $tag ) {
     global $bbdb;
-    $tag     = strtolower   ( $tag );
-    $tag     = preg_replace ( '/\s/', '', $tag );
-    $tag     = user_sanitize( $tag );
+    $tag     = tag_sanitize( $tag );
 
     return $bbdb->get_var("SELECT tag_id FROM $bbdb->tags WHERE tag = '$tag'");
@@ -742 +762 @@
 function get_tag_by_name( $tag ) {
     global $bbdb;
-    $tag     = strtolower   ( $tag );
-    $tag     = preg_replace ( '/\s/', '', $tag );
-    $tag     = user_sanitize( $tag );
+    $tag     = tag_sanitize( $tag );
 
     return $bbdb->get_row("SELECT * FROM $bbdb->tags WHERE tag = '$tag'");

trunk/bb-includes/template-functions.php

@@ -549 +549 @@
 }
 
+function tag_merge_form() {
+    global $tag, $current_user;
+    if ( $current_user->user_type < 2 )
+        return false;
+    $tag_merge_form  = '<form id="tag-merge" method="post" action="' . bb_get_option('uri') . 'bb-admin/tag-merge.php">' . "\n";
+    $tag_merge_form .= "<p>Merge this tag into the tag specified</p>\n<p>\n" . '<input type="text"   name="tag" size="10" maxlength="30" />' . "\n";
+    $tag_merge_form .= '<input type="hidden" name="id" value="' . $tag->tag_id . '" />' . "\n";
+    $tag_merge_form .= '<input type="submit" name="Submit" value="Merge" />' . "\n</p>\n</form>";
+    echo $tag_merge_form;
+}
+
 function tag_destroy_form() {
     global $tag, $current_user;

trunk/bb-templates/tag-single.php

@@ -6 +6 @@
 
 <?php tag_destroy_form(); ?>
+
+<?php tag_merge_form(); ?>
 
 <h2><a href="<?php option('uri'); ?>"><?php option('name'); ?></a> &raquo; <a href="<?php tag_page_link(); ?>">Tags</a> &raquo; <?php tag_name(); ?></h2>