Changeset 581

Timestamp:

01/10/2007 09:04:14 AM (19 years ago)

Author:

mdawaffe

Message:

axe resolution status. Relegate to plugin. re #496 props so1o

Location:

trunk

Files:

• bb-admin/admin-ajax.php (modified) (1 diff)
• bb-includes/functions.php (modified) (3 diffs)
• bb-includes/js/topic-js.php (modified) (1 diff)
• bb-includes/template-functions.php (modified) (2 diffs)
• bb-post.php (modified) (2 diffs)
• bb-templates/topic.php (modified) (1 diff)
• topic-resolve.php (modified) (1 diff)
• view.php (modified) (1 diff)

trunk/bb-admin/admin-ajax.php

@@ -91 +91 @@
     break;
 
-case 'update-resolution' :
-    $topic_id = (int) @$_POST['topic_id'];
-    $resolved = @$_POST['resolved'];
-
-    if ( !bb_current_user_can( 'edit_topic', $topic_id ) )
-        die('-1');
-
-    $topic = get_topic( $topic_id );
-    if ( !$topic )
-        die('0');
-
-    if ( bb_resolve_topic( $topic_id, $resolved ) ) {
-        $topic->topic_resolved = $resolved;
-        ob_start();
-            echo '<li id="resolution-flipper">' . __('This topic is') . ' ';
-            topic_resolved();
-            echo '</li>';
-        $data = ob_get_contents();
-        ob_end_clean();
-        $x = new WP_Ajax_Response( array(
-            'what' => 'resolution',
-            'id' => 'flipper',
-            'data' => $data
-        ) );
-        $x->send();
-    }
-    break;
-
 case 'delete-post' :
     $post_id = (int) $_POST['id'];

trunk/bb-includes/functions.php

@@ -89 +89 @@
 function untagged( $where ) {
     return $where . ' AND tag_count = 0 ';
-}
-
-function unresolved( $where ) {
-    return $where . " AND topic_resolved = 'no' ";
 }
 
@@ -920 +916 @@
         if ( $user = bb_get_user( $bb_post->poster_id ) )
             bb_update_usermeta( $user->ID, $bb_table_prefix . 'topics_replied', $user->topics_replied + 1 );
-}
-
-function bb_resolve_topic( $topic_id, $resolved = 'yes' ) {
-    global $bbdb, $bb_cache;
-    $topic_id = (int) $topic_id;
-    apply_filters( 'topic_resolution', $resolved, $topic_id );
-    if ( ! in_array($resolved, array('yes', 'no', 'mu')) )
-        return false;
-    $bb_cache->flush_one( 'topic', $topic_id );
-    $r = $bbdb->query("UPDATE $bbdb->topics SET topic_resolved = '$resolved' WHERE topic_id = '$topic_id'");
-    do_action( 'resolve_topic', $topic_id, $resolved, $r );
-    return $r;
 }
 
@@ -1556 +1540 @@
     if ( isset($views) && $cache )
         return $views;
-    $views = array('no-replies' => __('Topics with no replies'), 'untagged' => __('Topics with no tags'), 'unresolved' => __('Unresolved topics'));
-    return apply_filters('bb_views', $views);
+    
+    $views = array(
+        'no-replies' => __('Topics with no replies'), 
+        'untagged' => __('Topics with no tags'), 
+    );
+    
+    $views = apply_filters('bb_views', $views);
+    return $views;
 }
 

trunk/bb-includes/js/topic-js.php

@@ -59 +59 @@
     favLinkSetup();
             
-    var resolvedSub = $('resolvedformsub');
-    if ( !resolvedSub )
-        return;
-    resFunc = function(e) { return theTopicMeta.ajaxUpdater( 'resolution', 'resolved' ); }
-    resolvedSub.onclick = resFunc;
-    theTopicMeta.addComplete = function(what, where, update) {
-        if ( update && 'resolved' == where )
-            $('resolvedformsub').onclick = resFunc;
-    }
 } );
 

trunk/bb-includes/template-functions.php

@@ -599 +599 @@
 }
 
-function topic_resolved( $yes = '', $no = '', $mu = '', $id = 0 ) {
-    global $bb_current_user, $topic;
-    if ( empty($yes) )
-        $yes = __('resolved');
-    if ( empty($no) )
-        $no = __('not resolved');
-    if ( empty($mu) )
-        $mu = __('not a support question');
-    if ( bb_current_user_can( 'edit_topic', $topic->topic_id ) ) :
-        $resolved_form  = '<form id="resolved" method="post" action="' . bb_get_option('uri') . 'topic-resolve.php"><div>' . "\n";
-        $resolved_form .= '<input type="hidden" name="id" value="' . $topic->topic_id . "\" />\n";
-        $resolved_form .= '<select name="resolved" id="resolvedformsel" 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" id="resolvedformsub" value="'. __('Change') .'" />' . "\n</div>";
-        echo $resolved_form;
-        bb_nonce_field( 'resolve-topic_' . $topic->topic_id );
-        echo "\n</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;
-}
-
 function topic_last_post_link( $id = 0 ) {
     global $topic;
@@ -784 +743 @@
     elseif ( 1 < $topic->topic_status && bb_current_user_can( 'browse_deleted' ) )
         $class[] = 'bozo';
-    if ( 'yes' == $topic->topic_resolved )
-        $class[] = 'resolved';
     if ( '0' === $topic->topic_open )
         $class[] = 'closed';

trunk/bb-post.php

@@ -23 +23 @@
     $topic = trim( $_POST['topic'] );
     $tags  = trim( $_POST['tags']  );
-    $support = (int) $_POST['support'];
 
     if ('' == $topic)
@@ -29 +28 @@
 
     $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/topic.php

@@ -12 +12 @@
     <li><?php printf(__('<a href="%1$s">Latest reply</a> from %2$s'), get_topic_last_post_link(), get_topic_last_poster()) ?></li>
 <?php endif; ?>
-    <li id="resolution-flipper"><?php _e('This topic is') ?> <?php topic_resolved(); ?></li>
 <?php if ( $bb_current_user ) : $class = 0 === is_user_favorite( $bb_current_user->ID ) ? ' class="is-not-favorite"' : ''; ?>
     <li<?php echo $class;?> id="favorite-toggle"><?php user_favorites_link() ?></li>

trunk/topic-resolve.php

@@ -1 @@
-<?php
-require('./bb-load.php');
-
-bb_auth();
-
-if ( !$bb_current_user )
-    bb_die(__('You need to be logged in to add a tag.'));
-
-$topic_id = (int) @$_POST['id' ];
-$resolved =       @$_POST['resolved'];
-
-$topic = get_topic ( $topic_id );
-if ( !$topic )
-    bb_die(__('Topic not found.'));
-
-if ( !bb_current_user_can( 'edit_topic', $topic_id ) )
-    bb_die(__("You must be either the original poster or a moderator to change a topic's resolution status."));
-
-bb_check_admin_referer( 'resolve-topic_' . $topic_id );
-
-if ( bb_resolve_topic( $topic_id, $resolved ) )
-    wp_redirect( get_topic_link( $topic_id ) );
-else
-    bb_die(__('Invalid resolution status.'));
-?>

trunk/view.php

@@ -18 +18 @@
     $view_count = max($view_count, bb_count_last_query());
     break;  
-case 'unresolved' :
-    add_filter( 'get_latest_topics_where', 'unresolved' );
-    $topics = get_latest_topics( 0, $page );
-    $view_count = bb_count_last_query();
-    break;
 default :
-    do_action( 'bb_custom_view', $view );
+    do_action( 'bb_custom_view', $view, $page );
 endswitch;