Changeset 139

Timestamp:

06/11/2005 09:50:08 PM (21 years ago)

Author:

mdawaffe

Message:

Add topic_resolved column and resolution functions. Run most recent (top) line in bb-admin/upgrade.php. Fixes #78. Ensures normal users cannot edit resolution status, tags, etc. on close topic. Fixes #77.

Location:

trunk

Files:

• bb-admin/upgrade-schema.php (modified) (1 diff)
• bb-admin/upgrade.php (modified) (2 diffs)
• bb-includes/functions.php (modified) (5 diffs)
• bb-includes/template-functions.php (modified) (3 diffs)
• bb-post.php (modified) (2 diffs)
• bb-templates/post-form.php (modified) (1 diff)
• bb-templates/topic.php (modified) (1 diff)
• tag-add.php (modified) (1 diff)
• tag-remove.php (modified) (1 diff)
• topic-resolve.php (added)

trunk/bb-admin/upgrade-schema.php

@@ -37 +37 @@
   forum_id int(10) NOT NULL default '1',
   topic_status tinyint(1) NOT NULL default '0',
+  topic_resolved varchar(15) NOT NULL default 'no',
   topic_open tinyint(1) NOT NULL default '1',
   topic_last_post_id bigint(20) NOT NULL default '1',

trunk/bb-admin/upgrade.php

@@ -4 +4 @@
 set_time_limit(600);
 // Uncomment to use. Best to run one at a time
+
+/* Add _topics.topic_resolved column
+$bbdb->query("ALTER TABLE $bbdb->topics ADD topic_resolved VARCHAR(15) DEFAULT 'no' NOT NULL AFTER topic_status");
+echo "Done with adding topic_resolved column\n";
+flush();
+*/
 
 /* Populate _topics.topic_start_time: June 3rd, 2005
@@ -17 +23 @@
 unset($topics);
 echo "Done with adding topic_start_time...\n";
+flush();
+*/
+
+/* Add _topics.topic_start_time column
+$bbdb->query("ALTER TABLE $bbdb->topics ADD topic_start_time DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER topic_last_poster_name");
+echo "Done with adding topic_start_time column\n";
 flush();
 */

trunk/bb-includes/functions.php

@@ -344 +344 @@
     if ( $forum && $title ) {
         $bbdb->query("INSERT INTO $bbdb->topics 
-        (topic_title, topic_poster, topic_poster_name, topic_last_poster, topic_last_poster_name, topic_time, forum_id, topic_start_time)
+        (topic_title, topic_poster, topic_poster_name, topic_last_poster, topic_last_poster_name, topic_start_time, topic_time, forum_id)
         VALUES
-        ('$title', $current_user->user_id, '$current_user->username', $current_user->user_id, '$current_user->username', '$now', $forum, '$now')");
+        ('$title', $current_user->user_id, '$current_user->username', $current_user->user_id, '$current_user->username', '$now', '$now', $forum)");
         $topic_id = $bbdb->insert_id;
         if ( !empty( $tags ) )
@@ -428 +428 @@
 }
 
+function bb_resolve_topic ( $topic_id, $resolved = 'yes' ) {
+    global $bbdb;
+    if ( ! in_array($resolved, array('yes', 'no', 'mu')) )
+        return false;
+    bb_do_action('resolve_topic', $topic_id);
+    return $bbdb->query("UPDATE $bbdb->topics SET topic_resolved = '$resolved' WHERE topic_id = '$topic_id'");
+}
+
 function bb_close_topic ( $topic_id ) {
     global $bbdb;
@@ -545 +553 @@
     else
         return true;
+}
+
+function can_edit_topic( $topic_id, $user_id = 0 ) {
+    global $current_user;
+    if ( empty($current_user) )
+        return false;
+    if ( ! $user_id )
+        $user_id = $current_user->user_id;
+    $user = bb_get_user( $user_id );
+    $topic = get_topic( $topic_id );
+    $topic_poster = bb_get_user( $topic->topic_poster );
+
+    if ( $user->user_type > 1)
+        return true;
+
+    if ( $user->user_type > $topic_poster->user_type )
+        return true;
+
+    if ( $user->user_id != $topic_poster->user_id )
+        return false;
+    
+    if ( ! topic_is_open( $topic_id ) )
+        return false;
+
+    return true;
 }
 
@@ -628 +661 @@
 function add_topic_tag( $topic_id, $tag ) {
     global $bbdb, $current_user;
-    if ( !$tag_id = create_tag( $tag ))
+    if ( !topic_is_open($topic_id) && $current_user->user_type < 1 )
+        return false;
+    if ( !$tag_id = create_tag( $tag ) )
         return false;
     $now    = bb_current_time('mysql');
@@ -696 +731 @@
     $user = bb_get_user($user_id);
 
-    if ( $current_user->user_id != $user_id && $current_user->user_type < 1 )
+    if ( $current_user->user_type < 1 && ( !topic_is_open($topic_id) || $current_user->user_id != $user_id ) )
         return false;
     

trunk/bb-includes/template-functions.php

@@ -288 +288 @@
         $topic = get_topic( $id );
     return strtotime( $topic->topic_start_time );
+}
+
+function topic_resolved( $yes = 'resolved', $no = 'not resolved', $mu = 'not a support question', $id = 0 ) {
+    global $current_user, $topic;
+    if ( can_edit_topic( $topic->topic_id ) ) :
+        $resolved_form  = '<form id="resolved" method="post" action="' . bb_get_option('uri') . 'topic-resolve.php">' . "\n";
+        $resolved_form .= '<input type="hidden" name="id" value="' . $topic->topic_id . "\" />\n";
+        $resolved_form .= '<select name="resolved" tabindex="2">' . "\n";
+
+        $cases = array( 'yes', 'no', 'mu' );
+        $resolved = get_topic_resolved( $id );
+        foreach ( $cases as $case ) {
+            $selected = ( $case == $resolved ) ? ' selected="selected"' : '';
+            $resolved_form .= "<option value=\"$case\"$selected>${$case}</option>\n";
+        }
+
+        $resolved_form .= "</select>\n";
+        $resolved_form .= '<input type="submit" name="submit" value="Change" />' . "\n</form>";
+        echo $resolved_form;
+    else:
+        switch ( get_topic_resolved( $id ) ) {
+            case 'yes' : echo $yes; break;
+            case 'no'  : echo $no;  break;
+            case 'mu'  : echo $mu;  break;
+        }
+    endif;
+}   
+
+function get_topic_resolved( $id = 0 ) {
+    global $topic;
+    if ( $id )
+        $topic = get_topic( $id );
+    return $topic->topic_resolved;
 }
 
@@ -543 +576 @@
 
 function tag_form() {
-    global $current_user;
-    if ( $current_user ) 
+    global $topic, $current_user;
+    if ( !$current_user || $current_user->user_type < 1 && !topic_is_open($topic->topic_id) )
+        return false;
+    else
         include( BBPATH . '/bb-templates/tag-form.php');
 }
@@ -584 +619 @@
 function tag_remove_link( $tag_id = 0, $user_id = 0, $topic_id = 0 ) {
     global $tag, $current_user;
-    if ( $current_user->user_id != $tag->user_id && $current_user->user_type < 1 )
+    if ( $current_user->user_type < 1 && ( !topic_is_open($tag->topic_id) || $current_user->user_id != $tag->user_id ) )
         return false;
     echo '[<a href="' . bb_get_option('uri') . 'tag-remove.php?tag=' . $tag->tag_id . '&user=' . $tag->user_id . '&topic=' . $tag->topic_id . '" onclick="return confirm(\'Are you sure you want to remove the \\\'' . $tag->raw_tag . '\\\' tag?\')" title="Remove this tag">x</a>]';

trunk/bb-post.php

@@ -10 +10 @@
     $topic = trim( $_POST['topic'] );
     $tags  = trim( $_POST['tags']  );
+    $support = (int) $_POST['support'];
 
     if ('' == $topic)
@@ -15 +16 @@
 
     $topic_id = bb_new_topic( $topic, $forum, $tags );
+    if ( 1 != $support )
+        bb_resolve_topic( $topic_id, 'mu' );
 } elseif ( isset($_POST['topic_id'] ) ) {
     $topic_id = (int) $_POST['topic_id'];

trunk/bb-templates/post-form.php

@@ -7 +7 @@
   <input name="topic" type="text" id="topic" size="50" maxlength="80" tabindex="1" />
 </label>
+<label><input name="support" type="checkbox" id="support" checked="checked" value="1" tabindex="2"/>This is a support question.</label>
 </p>
 <?php endif; ?>
 <p><label>Post:<br />
-  <textarea name="post_content" cols="50" rows="8" id="post_content" tabindex="2"></textarea>
+  <textarea name="post_content" cols="50" rows="8" id="post_content" tabindex="3"></textarea>
   </label>
 </p>
 <?php if ( is_forum() || is_tag() ) : ?>
 <p>Enter a few words (called <a href="<?php tag_page_link(); ?>">tags</a>) separated by spaces to help someone find your topic:<br />
-<input name="tags" type="text" size="50" maxlength="100" value="<?php tag_name(); ?> " tabindex="3" />
+<input name="tags" type="text" size="50" maxlength="100" value="<?php tag_name(); ?> " tabindex="4" />
 </p>
 <?php endif; ?>

trunk/bb-templates/topic.php

@@ -13 +13 @@
     <li><?php topic_posts(); ?> posts so far</li>
     <li>Latest reply from <?php topic_last_poster(); ?></li>
+    <li>This topic is <?php topic_resolved(); ?></li>
 </ul>
 <br clear="all" />

trunk/tag-add.php

@@ -16 +16 @@
 if ( add_topic_tag( $topic_id, $tag ) )
     header('Location: ' . get_topic_link( $topic_id ) );
+else
+    die('The tag was not added.  Either the tag name was invalid or the topic is closed.');
 ?>

trunk/tag-remove.php

@@ -17 +17 @@
     header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
 else
-    die('The tag was not fully removed.');
+    die('The tag was not removed.  You cannot remove a tag from a closed topic.');
 exit;
 ?>