Ticket #20487: comment_search_20487_v1.diff

wp-includes/comment.php

@@ -222 +222 @@
                         'type' => '',
                         'user_id' => '',
                         'search' => '',
+            'search_type' => '',
+            'search_field' => '',
                         'count' => false
                 );
 
@@ -361 +363 @@
          */
         function get_search_sql( $string, $cols ) {
                 $string = esc_sql( like_escape( $string ) );
+        $wildcard = '%';
+        if($this->query_vars['search_type'] == 'exact') $wildcard = '';
 
                 $searches = array();
-                foreach ( $cols as $col )
-                        $searches[] = "$col LIKE '%$string%'";
+        if($this->query_vars['search_field'] && in_array($this->query_vars['search_field'], $cols)) {
+            $searches[] = $this->query_vars['search_field'] . " LIKE '$wildcard$string$wildcard'";
+        } else {
+                    foreach ( $cols as $col )
+                            $searches[] = "$col LIKE '%$string%'";
+        }
 
+        if (count($searches) == 1) return ' AND ' . $searches[0]; 
                 return ' AND (' . implode(' OR ', $searches) . ')';
         }
 }

wp-admin/edit-comments.php

@@ -232 +232 @@
 <?php if ( $post_id ) : ?>
 <input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
 <?php endif; ?>
-<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
 
 <input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />

wp-admin/includes/class-wp-comments-list-table.php

@@ -50 +50 @@
                 $comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
 
                 $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
+        $search_type = ( isset( $_REQUEST['s_type'] ) ) ? $_REQUEST['s_type'] : '';
+        $search_field = ( isset( $_REQUEST['s_field'] ) ) ? $_REQUEST['s_field'] : '';
 
                 $user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
 
@@ -87 +89 @@
                 $args = array(
                         'status' => isset( $status_map[$comment_status] ) ? $status_map[$comment_status] : $comment_status,
                         'search' => $search,
+            'search_type' => $search_type,
+            'search_field' => $search_field,
                         'user_id' => $user_id,
                         'offset' => $start,
                         'number' => $number,
@@ -462 +466 @@
                         }
                         echo '<a href="edit-comments.php?s=';
                         comment_author_IP();
-                        echo '&amp;mode=detail';
+                        echo '&amp;mode=detail&amp;s_type=exact&amp;s_field=comment_author_IP';
                         if ( 'spam' == $comment_status )
                                 echo '&amp;comment_status=spam';
                         echo '">';
@@ -506 +510 @@
         function column_default( $comment, $column_name ) {
                 do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
         }
+    function search_box( $text, $input_id ) {
+        if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+            return;
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) )
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        if ( ! empty( $_REQUEST['order'] ) )
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+?>
+<p class="search-box">
+    <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
+    <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
+    <label for="<?php echo $input_id ?>_field"><strong>Field</strong></label>
+    <select name="s_field" id="<?php echo $input_id ?>_field" value="">
+        <option value="">All</option>
+        <option value="comment_author"<?php print (isset($_REQUEST['s_field']) && $_REQUEST['s_field'] == 'comment_author') ? ' selected="selected"' : ''; ?>>User Name</option>
+        <option value="comment_author_url"<?php print (isset($_REQUEST['s_field']) && $_REQUEST['s_field'] == 'comment_author_url') ? ' selected="selected"' : ''; ?>>User URL</option>
+        <option value="comment_author_IP"<?php print (isset($_REQUEST['s_field']) && $_REQUEST['s_field'] == 'comment_author_IP') ? ' selected="selected"' : ''; ?>>User IP</option>
+        <option value="comment_author_email"<?php print (isset($_REQUEST['s_field']) && $_REQUEST['s_field'] == 'comment_author_email') ? ' selected="selected"' : ''; ?>>User E-mail</option>
+        <option value="comment_content"<?php print (isset($_REQUEST['s_field']) && $_REQUEST['s_field'] == 'comment_content') ? ' selected="selected"' : ''; ?>>Comment Content</option>
+    </select>
+    <label for="<?php echo $input_id ?>_status"><strong>Status</strong></label>
+    <select name="comment_status" id="<?php echo $input_id ?>_status" value="">     
+        <option value="">Any</option>
+        <option value="approved"<?php print (isset($_REQUEST['comment_status']) && $_REQUEST['comment_status'] == 'approved') ? ' selected="selected"' : ''; ?>>Approved</option>
+        <option value="moderated"<?php print (isset($_REQUEST['comment_status']) && $_REQUEST['comment_status'] == 'moderated') ? ' selected="selected"' : ''; ?>>Pending</option>
+        <option value="spam"<?php print (isset($_REQUEST['comment_status']) && $_REQUEST['comment_status'] == 'spam') ? ' selected="selected"' : ''; ?>>Spam</option>
+        <option value="trash"<?php print (isset($_REQUEST['comment_status']) && $_REQUEST['comment_status'] == 'trash') ? ' selected="selected"' : ''; ?>>Trash</option>
+    </select>
+    <label for="<?php echo $input_id ?>_type_exact">Exact</label> <input type="radio" name="s_type" id="<?php echo $input_id ?>_type_exact" value="exact"<?php print (isset($_REQUEST['s_type']) && $_REQUEST['s_type'] == 'exact') ? ' checked="checked"' : ''; ?> />
+    <label for="<?php echo $input_id ?>_type_wildcard">Wildcard</label> <input type="radio" name="s_type" id="<?php echo $input_id ?>_type_wildcard" value="wildcard"<?php print (isset($_REQUEST['s_type']) && $_REQUEST['s_type'] == 'wildcard') ? ' checked="checked"' : ''; ?> />
+    <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
+</p>
+<?php
+    }
+
 }
 
 /**