Changeset 5822

Timestamp:

02/21/2012 08:50:41 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add ajax search to Private Messages inbox and sentbox. Fixes #3993. Props sbrajesh.

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-messages/bp-messages-classes.php (modified) (2 diffs)
• bp-messages/bp-messages-template.php (modified) (5 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default-rtl.css (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/members/single/messages.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/messages-loop.php (modified) (2 diffs)

trunk/bp-core/bp-core-template.php

@@ -1453 +1453 @@
 }
 
+function bp_is_messages_conversation() {
+    if ( bp_is_user_messages() && ( bp_is_current_action( 'view' ) ) )
+        return true;
+
+    return false;
+}
 
 function bp_is_single( $component, $callback ) {

trunk/bp-messages/bp-messages-classes.php

@@ -89 +89 @@
     }
 
-    function get_current_threads_for_user( $user_id, $box = 'inbox', $type = 'all', $limit = null, $page = null ) {
-        global $wpdb, $bp;
-
-        $pag_sql = $type_sql = '';
+    function get_current_threads_for_user( $user_id, $box = 'inbox', $type = 'all', $limit = null, $page = null, $search_terms = '' ) {
+        global $wpdb, $bp;
+
+        $pag_sql = $type_sql = $search_sql = '';
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
@@ -101 +101 @@
             $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
 
+        if ( !empty( $search_terms ) ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql   = "AND ( subject LIKE '%%$search_terms%%' OR message LIKE '%%$search_terms%%' )";
+        }
+                
         if ( 'sentbox' == $box ) {
-            $thread_ids = $wpdb->get_results( $wpdb->prepare( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND m.sender_id = %d AND r.is_deleted = 0 GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}", $user_id ) );
-            $total_threads = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND m.sender_id = %d AND r.is_deleted = 0 ", $user_id ) );
+            $thread_ids    = $wpdb->get_results( $wpdb->prepare( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND m.sender_id = %d AND r.is_deleted = 0 {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}", $user_id ) );
+            $total_threads = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND m.sender_id = %d AND r.is_deleted = 0 {$search_sql} ", $user_id ) );
         } else {
-            $thread_ids = $wpdb->get_results( $wpdb->prepare( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d AND r.sender_only = 0 {$type_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}", $user_id ) );
-            $total_threads = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d AND r.sender_only = 0 {$type_sql}", $user_id ) );
+            $thread_ids = $wpdb->get_results( $wpdb->prepare( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d AND r.sender_only = 0 {$type_sql} {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}", $user_id ) );
+            $total_threads = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d AND r.sender_only = 0 {$type_sql} {$search_sql} ", $user_id ) );
         }
 

trunk/bp-messages/bp-messages-template.php

@@ -28 +28 @@
     var $pag_num;
     var $pag_links;
+    var $search_terms;
 
     function bp_messages_box_template( $user_id, $box, $per_page, $max, $type ) {
@@ -33 +34 @@
     }
 
-    function __construct( $user_id, $box, $per_page, $max, $type ) {
+    function __construct( $user_id, $box, $per_page, $max, $type, $search_terms ) {
         $this->pag_page = isset( $_GET['mpage'] ) ? intval( $_GET['mpage'] ) : 1;
-        $this->pag_num  = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-
-        $this->user_id  = $user_id;
-        $this->box      = $box;
-        $this->type     = $type;
-
+        $this->pag_num  = isset( $_GET['num'] )   ? intval( $_GET['num'] )   : $per_page;
+
+        $this->user_id      = $user_id;
+        $this->box          = $box;
+        $this->type         = $type;
+        $this->search_terms = $search_terms;
+        
         if ( 'notices' == $this->box ) {
             $this->threads = BP_Messages_Notice::get_notices();
         } else {
-            $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->type, $this->pag_num, $this->pag_page );
+            $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->type, $this->pag_num, $this->pag_page, $this->search_terms );
 
             $this->threads            = $threads['threads'];
@@ -169 +171 @@
 
     $defaults = array(
-        'user_id'  => bp_loggedin_user_id(),
-        'box'      => 'inbox',
-        'per_page' => 10,
-        'max'      => false,
-        'type'     => 'all'
+        'user_id'      => bp_loggedin_user_id(),
+        'box'          => 'inbox',
+        'per_page'     => 10,
+        'max'          => false,
+        'type'         => 'all',
+        'search_terms' => isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : ''
     );
 
@@ -194 +197 @@
         }
 
-        $messages_template = new BP_Messages_Box_Template( $user_id, $box, $per_page, $max, $type );
+        $messages_template = new BP_Messages_Box_Template( $user_id, $box, $per_page, $max, $type, $search_terms );
     }
 
@@ -354 +357 @@
 
     echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?><?php
+}
+
+/**
+ * Output the Private Message search form
+ *
+ * @since BuddyPress (1.6)
+ */
+function bp_message_search_form() {
+
+    $default_search_value = bp_get_search_default_text( 'messages' );
+    $search_value         = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
+
+    <form action="" method="get" id="search-message-form">
+        <label><input type="text" name="s" id="messages_search" <?php if ( $search_value === $default_search_value ) : ?>placeholder="<?php echo esc_html( $search_value ); ?>"<?php endif; ?> <?php if ( $search_value !== $default_search_value ) : ?>value="<?php echo esc_html( $search_value ); ?>"<?php endif; ?> /></label>
+        <input type="submit" id="messages_search_submit" name="messages_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+    </form>
+
+<?php
 }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -101 +101 @@
     locate_template( array( "$object/$object-loop.php" ), true );
 }
-add_action( 'wp_ajax_members_filter', 'bp_dtheme_object_template_loader' );
-add_action( 'wp_ajax_groups_filter',  'bp_dtheme_object_template_loader' );
-add_action( 'wp_ajax_blogs_filter',   'bp_dtheme_object_template_loader' );
-add_action( 'wp_ajax_forums_filter',  'bp_dtheme_object_template_loader' );
+add_action( 'wp_ajax_members_filter',  'bp_dtheme_object_template_loader'   );
+add_action( 'wp_ajax_groups_filter',   'bp_dtheme_object_template_loader'   );
+add_action( 'wp_ajax_blogs_filter',    'bp_dtheme_object_template_loader'   );
+add_action( 'wp_ajax_forums_filter',   'bp_dtheme_object_template_loader'   );
+add_action( 'wp_ajax_messages_filter', 'bp_dtheme_messages_template_loader' );
+
+/*
+ * Load messages when searched on the private message page
+ */
+
+function bp_dtheme_messages_template_loader(){
+    locate_template( array( 'members/single/messages/messages-loop.php' ), true );
+}
 
 // This function will load the activity loop template when activity is requested via AJAX

trunk/bp-themes/bp-default/_inc/css/default-rtl.css

@@ -762 +762 @@
     text-align: left;
 }
+div.message-search {
+    float: left;
+}

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -2361 +2361 @@
 }
 
+div.message-search {
+    float: right;
+    margin: 0 20px;
+}
+
 /*--------------------------------------------------------------
 6.9 - Extended Profiles

trunk/bp-themes/bp-default/_inc/global.js

@@ -982 +982 @@
     /** Private Messaging ******************************************/
 
+    /** Message search*/
+    jq('.message-search').click( function(event) {
+        if ( jq(this).hasClass('no-ajax') )
+            return;
+
+        var target = jq(event.target);
+
+        if ( target.attr('type') == 'submit' ) {
+            //var css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
+            var object = 'messages';
+
+            bp_filter_request( object, jq.cookie('bp-' + object + '-filter'), jq.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1, jq.cookie('bp-' + object + '-extras') );
+
+            return false;
+        }
+    });
+
     /* AJAX send reply functionality */
     jq("input#send_reply_button").click(

trunk/bp-themes/bp-default/members/single/messages.php

@@ -16 +16 @@
 
     </ul>
+    
+    <?php if ( bp_is_messages_inbox() || bp_is_messages_sentbox() ) : ?>
+
+        <div class="message-search"><?php bp_message_search_form(); ?></div>
+
+    <?php endif; ?>
+
 </div><!-- .item-list-tabs -->
 

trunk/bp-themes/bp-default/members/single/messages/messages-loop.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_member_messages_loop' ); ?>
 
-<?php if ( bp_has_message_threads() ) : ?>
+<?php if ( bp_has_message_threads( bp_ajax_querystring( 'messages' ) ) ) : ?>
 
     <div class="pagination no-ajax" id="user-pag">
@@ -16 +16 @@
 
     <?php do_action( 'bp_after_member_messages_pagination' ); ?>
-    <?php do_action( 'bp_before_member_messages_threads' ); ?>
+
+    <?php do_action( 'bp_before_member_messages_threads'   ); ?>
 
     <table id="message-threads" class="messages-notices">