Changeset 2322 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

01/17/2010 08:27:37 PM (16 years ago)

Author:

apeatling

Message:

Better support for plugins to hook into ajax functionality in the default theme.

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (3 diffs)

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

@@ -19 +19 @@
     $search_terms = esc_attr( $_POST['search_terms'] );
 
+    /* Plugins can pass extra parameters and use the bp_dtheme_ajax_querystring_content_filter filter to parse them */
+    $extras = esc_attr( $_POST['extras'] );
+
     if ( __( 'Search anything...', 'buddypress' ) == $search_terms || 'false' == $search_terms )
         $search_terms = false;
 
     /* Build the querystring */
-    if ( 'active' != $filter && 'newest' != $filter && 'popular' != $filter && 'online' != $filter && 'alphabetical' != $filter )
+    if ( empty( $filter ) )
         $filter = 'active';
 
+    if ( empty( $type ) )
+        $type = 'all';
+
     $bp->ajax_querystring = 'type=' . $filter . '&page=' . $page;
 
-    if ( $search_terms )
+    if ( !empty( $search_terms ) )
         $bp->ajax_querystring .= '&search_terms=' . $search_terms;
 
-    if ( !$type )
-        $type = 'all';
-
-    if ( ( 'all' != $type ) && !is_user_logged_in() )
-        $filter = 'all';
-
-    if ( 'all' != $type || $bp->displayed_user->id ) {
+    if ( $bp->displayed_user->id ) {
         $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
         $bp->ajax_querystring .= '&user_id=' . $user_id;
     }
+
+    $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_content_filter', $bp->ajax_querystring, $extras );
 
     locate_template( array( "$content/$content-loop.php" ), true );
@@ -164 +166 @@
 
     if ( !$query_string ) {
-
         /* If we are on a profile page we only want to show that users activity */
         if ( $bp->displayed_user->id ) {
@@ -238 +239 @@
     $query_string = implode( '&', $new_args ) . '&page=' . $page;
 
-    $bp->ajax_querystring = $query_string;
+    $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_activity_filter', $query_string, $type );
     $result['query_string'] = $bp->ajax_querystring;
-    $result['feed_url'] = $feed_url;
+    $result['feed_url'] = apply_filters( 'bp_dtheme_ajax_feed_url', $feed_url );
 
     /* Buffer the loop in the template to a var for JS to spit out. */