Changeset 891

Timestamp:

06/28/2007 07:03:57 AM (19 years ago)

Author:

mdawaffe

Message:

BB_Query_Form generic enough for topics and forms. Fixes #602

Location:

trunk

Files:

• bb-admin/content-posts.php (modified) (1 diff)
• bb-admin/content.php (modified) (1 diff)
• bb-admin/style.css (modified) (2 diffs)
• bb-includes/classes.php (modified) (7 diffs)
• bb-includes/template-functions.php (modified) (1 diff)

trunk/bb-admin/content-posts.php

@@ -7 +7 @@
     add_filter( 'get_topic_where', 'no_where' );
     add_filter( 'get_topic_link', 'bb_make_link_view_all' );
-    $post_query = new BB_Query( 'post', array( 'post_status' => 1 ) );
+    $post_query = new BB_Query_Form( 'post', array( 'post_status' => 1 ) );
     $bb_posts =& $post_query->results;
     $total = $post_query->found_rows;
 ?>
 
-<h2><?php _e('Deleted Posts'); ?></h2>
+<h2><?php
+$h2_search = $post_query->get( 'post_text' );
+$h2_forum  = $post_query->get( 'forum_id' );
+$h2_tag    = $post_query->get( 'tag_id' );
+$h2_author = $post_query->get( 'post_author_id' );
+$h2_status = $post_query->get( 'post_status' );
+
+$h2_search = $h2_search ? ' ' . sprintf( __('matching &#8220;%s&#8221;'), wp_specialchars( $h2_search ) ) : '';
+$h2_forum  = $h2_forum  ? ' ' . sprintf( __('in &#8220;%s&#8221;')      , get_forum_name( $h2_forum ) ) : '';
+$h2_tag    = $h2_tag    ? ' ' . sprintf( __('with tag &#8220;%s&#8221;'), wp_specialchars( get_tag_name( $h2_tag ) ) ) : '';
+$h2_author = $h2_author ? ' ' . sprintf( __('by %s')                    , wp_specialchars( get_user_name( $h2_author ) ) ) : '';
+
+$stati = array( 0 => __('Normal') . ' ', 1 => __('Deleted') . ' ', 'all' => '' );
+
+if ( 'all' == $h2_status )
+    $h2_noun = __('Posts');
+else
+    $h2_noun = sprintf( __( '%1$sposts'), $stati[$h2_status], $topic_open[$h2_open] );
+
+printf( __( '%1$s%2$s%3$s%4$s%5$s' ), $h2_noun, $h2_search, $h2_forum, $h2_tag, $h2_author );
+
+?></h2>
+
+<?php $post_query->form( array('tag' => true, 'post_author' => true, 'post_status' => true, 'submit' => __('Filter &#187;')) ); ?>
+
+<br class="clear" />
 
 <ol id="the-list">

trunk/bb-admin/content.php

@@ -38 +38 @@
 ?></h2>
 
-<?php $topic_query->topic_search_form( array('tag' => true, 'author' => true, 'status' => true, 'open' => true, 'submit' => __('Filter &#187;')) ); ?>
+<?php $topic_query->form( array('tag' => true, 'topic_author' => true, 'topic_status' => true, 'open' => true, 'submit' => __('Filter &#187;')) ); ?>
 
 <br class="clear" />

trunk/bb-admin/style.css

@@ -476 +476 @@
 }
 
-#topic-search-form fieldset {
+.search-form fieldset {
     float: left;
     margin: 0 1.5ex 1em 0;
@@ -482 +482 @@
 }
 
-#topic-search-form fieldset legend {
+.search-form fieldset legend {
     padding: 0 0 .2em 1px;
 }
     
-#topic-search-form .text-input {
+.search-form .text-input {
     padding: 4px 3px;
 }
 
-#topic-search-form #topic-search-form-submit {
+.search-form .submit-input {
     float: left;
     margin: 12px 0 1em;

trunk/bb-includes/classes.php

@@ -345 +345 @@
                     $where .= " AND t.topic_id IN (" . join(',', $tagged_topic_ids) . ")";
                 else
-                    $where .= " /* No such tag */ AND 0";
+                    $where .= " AND 0 /* No such tag */";
             endif;
 
@@ -475 +475 @@
                     $where .= " AND p.topic_id IN (" . join(',', $tagged_topic_ids) . ")";
                 else
-                    $where .= " /* No such tag */ AND 0";
+                    $where .= " AND 0 /* No such tag */";
             endif;
 
@@ -698 +698 @@
     }
 
-    function topic_search_form( $args = null ) {
+    function form( $args = null ) {
+        $_post = 'post' == $this->type;
+
         $defaults = array(
             'search' => true,
             'forum'  => true,
             'tag'    => false,
-            'author' => false,
-            'status' => false,
             'open'   => false,
-            'topic_title' => false,
-
-            'id'     => 'topic-search-form',
+            'topic_author' => false,
+            'post_author'  => false,
+            'topic_status' => false,
+            'post_status'  => false,
+            'topic_title'  => false,
+
             'method' => 'get',
-            'submit' => __('Search »')
+            'submit' => __('Search »'),
+            'action' => ''
         );
+        $defaults['id'] = $_post ? 'post-search-form' : 'topic-search-form';
 
         $args = wp_parse_args( $args, $defaults );
@@ -719 +724 @@
         $method = 'get' == strtolower($method) ? 'get' : 'post';
         $submit = attribute_escape( $submit );
+        $action = clean_url( $action );
 
         if ( $this->query_vars )
@@ -727 +733 @@
         extract($query_vars, EXTR_PREFIX_ALL, 'q');
 
-        $r  = "<form action='' method='$method' id='$id'>\n";
-
-        $q_search = attribute_escape( $q_search );
+        $r  = "<form action='' method='$method' id='$id' class='search-form'>\n";
+
         if ( $search ) {
+            if ( $_post ) {
+                $s_value = attribute_escape( $q_post_text );
+                $s_name = 'post_text';
+                $s_id = 'post-text';
+            } else {
+                $s_value = attribute_escape( $q_search );
+                $s_name = $s_id = 'search';
+            }
             $r .= "\t<fieldset><legend>" . __('Search&#8230;') . "</legend>\n";
-            $r .= "\t\t<input name='search' id='search' type='text' class='text-input' value='$q_search'>";
+            $r .= "\t\t<input name='$s_name' id='$s_id' type='text' class='text-input' value='$s_value'>";
             $r .= "\t</fieldset>\n\n";
         }
@@ -749 +762 @@
         }
 
-        if ( $author ) {
+        if ( $topic_author ) {
             $q_topic_author = attribute_escape( $q_topic_author );
-            $r .= "\t<fieldset><legend>" . __('Author&#8230;') . "</legend>\n";
+            $r .= "\t<fieldset><legend>" . __('Topic Author&#8230;') . "</legend>\n";
             $r .= "\t\t<input name='topic_author' id='topic-author' type='text' class='text-input' value='$q_topic_author'>";
             $r .= "\t</fieldset>\n\n";
         }
 
-        if ( $status ) {
-            $r .= "\t<fieldset><legend>" . __('Status&#8230;') . "</legend>\n";
+        if ( $post_author ) {
+            $q_post_author = attribute_escape( $q_post_author );
+            $r .= "\t<fieldset><legend>" . __('Post Author&#8230;') . "</legend>\n";
+            $r .= "\t\t<input name='post_author' id='post-author' type='text' class='text-input' value='$q_post_author'>";
+            $r .= "\t</fieldset>\n\n";
+        }
+
+        $stati = array( 'all' => __('All'), '0' => __('Normal'), '1' => __('Deleted') );
+
+        if ( $topic_status ) {
+            $r .= "\t<fieldset><legend>" . __('Topic Status&#8230;') . "</legend>\n";
             $r .= "\t\t<select name='topic_status' id='topic-status'>\n";
-            foreach ( array( 'all' => __('All'), '0' => __('Normal'), '1' => __('Deleted') ) as $status => $label ) {
-                $label = wp_specialchars( $label );
+            foreach ( $stati as $status => $label ) {
                 $selected = (string) $status == (string) $q_topic_status ? " selected='selected'" : '';
+                $r .= "\t\t\t<option value='$status'$selected>$label</option>\n";
+            }
+            $r .= "\t\t</select>\n";
+            $r .= "\t</fieldset>\n\n";
+        }
+
+        if ( $post_status ) {
+            $r .= "\t<fieldset><legend>" . __('Post Status&#8230;') . "</legend>\n";
+            $r .= "\t\t<select name='post_status' id='post-status'>\n";
+            foreach ( $stati as $status => $label ) {
+                $selected = (string) $status == (string) $q_post_status ? " selected='selected'" : '';
                 $r .= "\t\t\t<option value='$status'$selected>$label</option>\n";
             }
@@ -792 +824 @@
         echo $r;
     }
-
 }
 

trunk/bb-includes/template-functions.php

@@ -878 +878 @@
         $query_obj =& $bb_query_form;
 
-    $query_obj->topic_search_form( $args );
+    $query_obj->form( $args );
 }