Changeset 89

Timestamp:

04/24/2005 04:43:11 PM (18 years ago)

Author:

matt

Message:

Show tags to the right people, de-dupe public tags.

Location:

trunk

Files:

• bb-includes/functions.php (modified) (1 diff)
• bb-includes/template-functions.php (modified) (1 diff)
• bb-templates/post-form.php (modified) (1 diff)
• bb-templates/tag-form.php (added)
• bb-templates/topic-tags.php (modified) (1 diff)
• bb-templates/topic.php (modified) (1 diff)
• topic.php (modified) (1 diff)

trunk/bb-includes/functions.php

@@ -676 +676 @@
 }
 
+function get_public_tags ( $topic_id ) {
+    $tags = get_topic_tags ( $topic_id );
+    if ( !is_array( $tags ) )
+        return;
+    $used_tags   = array();
+    $public_tags = array();
+
+    foreach ( $tags as $tag ) :
+        if ( !in_array($tag->tag_id, $used_tags) ) :
+            $public_tags[] = $tag;
+            $used_tags[]   = $tag->tag_id;
+        endif;
+    endforeach;
+    return $public_tags;
+}
+
 function bb_find_filename( $text ) { 
     $text = preg_replace('|.*?/([a-z]+\.php)/?.*|', '$1', $text);

trunk/bb-includes/template-functions.php

@@ -493 +493 @@
 }
 
+function tag_form() {
+    global $current_user;
+    if ($current_user) 
+        include( BBPATH . '/bb-templates/tap-form.php');
+}
+
 ?>

trunk/bb-templates/post-form.php

@@ -1 +1 @@
 
-<form name="post" id="post" method="post" action="<?php option('uri'); ?>bb-post.php">
+<form class="postform" method="post" action="<?php option('uri'); ?>bb-post.php">
 <?php if ( is_forum() ) : ?>
 <p>Before posting a new topic, <a href="<?php option('uri'); ?>search.php">be sure to search</a> to see if one has been started already.</p>

trunk/bb-templates/topic-tags.php

@@ -24 +24 @@
 
 </div>
+
+<?php tag_form(); ?>

trunk/bb-templates/topic.php

@@ -5 +5 @@
 <h3><a href="<?php option('uri'); ?>"><?php option('name'); ?></a> &raquo; <a href="<?php forum_link(); ?>"><?php forum_name(); ?></a></h3>
 <h2><?php topic_title(); ?></h2>
-<form name="post" id="post" method="post" action="<?php option('uri'); ?>tag-add.php">
-<fieldset id="addtag">
-Add tag: <input name="tag" type="text" id="tag" size="10" maxlength="30" /> 
-<input type="hidden" name="id" value="<?php topic_id(); ?>" />
-<input type="submit" name="Submit" value="Add">
-</fieldset>
-</form>
 
 <?php topic_tags(); ?>

trunk/topic.php

@@ -21 +21 @@
     $user_tags  = get_user_tags  ( $topic_id, $current_user->user_id );
     $other_tags = get_other_tags ( $topic_id, $current_user->user_id );
+} elseif ( is_array($tags) ) {
+    $user_tags  = false;
+    $other_tags = get_public_tags( $topic_id );
 } else {
     $user_tags  = false;