Changeset 2580

Timestamp:

02/04/2010 10:09:40 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1793 - remove querystring building from theme and querystring cookie management from core.

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (3 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (4 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (11 diffs)
• bp-themes/bp-default/activity/activity-loop.php (modified) (1 diff)
• bp-themes/bp-default/blogs/blogs-loop.php (modified) (1 diff)
• bp-themes/bp-default/forums/forums-loop.php (modified) (1 diff)
• bp-themes/bp-default/groups/groups-loop.php (modified) (1 diff)
• bp-themes/bp-default/members/members-loop.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -125 +125 @@
     $include = false;
     $show_hidden = false;
-    $search_terms = false;
     $object = false;
-    $action = false;
     $primary_id = false;
-    $display_comments = 'threaded';
 
     /* User filtering */
     if ( !empty( $bp->displayed_user->id ) )
         $user_id = $bp->displayed_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-activity-filter'] ) && '-1' != $_COOKIE['bp-activity-filter'] )
-        $action = $_COOKIE['bp-activity-filter'];
-
-    /* User activity scope filtering */
-    if ( !empty( $user_id ) || !empty( $_COOKIE['bp-activity-scope'] ) ) {
-        $scope = ( !empty( $bp->current_action ) ) ? $bp->current_action : $_COOKIE['bp-activity-scope'];
-        $current_user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-        if ( empty( $scope ) || 'just-me' == $scope )
-            $display_comments = 'stream';
-
-        switch ( $scope ) {
-            case 'friends':
-                if ( function_exists( 'friends_get_friend_user_ids' ) )
-                    $user_id = implode( ',', (array)friends_get_friend_user_ids( $current_user_id ) );
-                break;
-            case 'groups':
-                if ( function_exists( 'groups_get_user_groups' ) ) {
-                    $groups = groups_get_user_groups( $current_user_id );
-                    $object = $bp->groups->id;
-                    $primary_id = implode( ',', (array)$groups['groups'] );
-                    $show_hidden = ( $current_user_id == $bp->loggedin_user->id ) ? 1 : 0;
-                    $user_id = false;
-                }
-                break;
-            case 'favorites':
-                $favs = bp_activity_get_user_favorites( $current_user_id );
-                $include = implode( ',', (array)$favs );
-                $show_hidden = ( $current_user_id == $bp->loggedin_user->id ) ? 1 : 0;
-                break;
-            case 'mentions':
-                $user_nicename = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
-                $user_login = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
-                $search_terms = '@' . bp_core_get_username( $current_user_id, $user_nicename, $user_login );
-                $show_hidden = ( $current_user_id == $bp->loggedin_user->id ) ? 1 : 0;
-                $display_comments = 'stream';
-                $user_id = false;
-                break;
-        }
-    }
 
     /* Group filtering */
@@ -192 +147 @@
     /* Note: any params used for filtering can be a single value, or multiple values comma separated. */
     $defaults = array(
-        'display_comments' => $display_comments, // false for none, stream/threaded - show comments in the stream or threaded under items
+        'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
         'include' => $include, // pass an activity_id or string of ID's comma separated
         'sort' => 'DESC', // sort DESC or ASC
@@ -200 +155 @@
         'show_hidden' => $show_hidden, // Show activity items that are hidden site-wide?
 
+        /* Scope - pre-built activity filters for a user (friends/groups/favorites/mentions) */
+        'scope' => $bp->current_action,
+
         /* Filtering */
         'user_id' => $user_id, // user_id to filter on
         'object' => $object, // object to filter on e.g. groups, profile, status, friends
-        'action' => $action, // action to filter on e.g. activity_update, new_forum_post, profile_updated
+        'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
         'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
         'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
 
         /* Searching */
-        'search_terms' => $search_terms // specify terms to search on
+        'search_terms' => false // specify terms to search on
     );
 
     $r = wp_parse_args( $args, $defaults );
     extract( $r );
+
+    /* If you have passed a "scope" then this will override any filters you have passed. */
+    if ( !empty( $scope ) ) {
+        if ( 'just-me' == $scope )
+            $display_comments = 'stream';
+
+        if ( $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id ) {
+            switch ( $scope ) {
+                case 'friends':
+                    if ( function_exists( 'friends_get_friend_user_ids' ) )
+                        $user_id = implode( ',', (array)friends_get_friend_user_ids( $user_id ) );
+                    break;
+                case 'groups':
+                    if ( function_exists( 'groups_get_user_groups' ) ) {
+                        $groups = groups_get_user_groups( $user_id );
+                        $object = $bp->groups->id;
+                        $primary_id = implode( ',', (array)$groups['groups'] );
+                        $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+                        $user_id = false;
+                    }
+                    break;
+                case 'favorites':
+                    $favs = bp_activity_get_user_favorites( $user_id );
+                    if ( empty( $favs ) )
+                        return false;
+
+                    $include = implode( ',', (array)$favs );
+                    $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+                    break;
+                case 'mentions':
+                    $user_nicename = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
+                    $user_login = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
+                    $search_terms = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login );
+                    $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+                    $display_comments = 'stream';
+                    $user_id = false;
+                    break;
+            }
+        }
+    }
 
     if ( $max ) {

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -117 +117 @@
     $type = 'active';
     $user_id = false;
-    $page = 1;
+    $search_terms = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-blogs-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-blogs-filter'] ) && '-1' != $_COOKIE['bp-blogs-filter'] )
-        $type = $_COOKIE['bp-blogs-filter'];
-
-    if ( !empty( $_COOKIE['bp-blogs-page'] ) && '-1' != $_COOKIE['bp-blogs-page'] )
-        $page = $_COOKIE['bp-blogs-page'];
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
+
+    if ( !empty( $_REQUEST['s'] ) )
+        $search_terms = $_REQUEST['s'];
 
     $defaults = array(
         'type' => $type,
-        'page' => $page,
+        'page' => 1,
         'per_page' => 20,
         'max' => false,
 
         'user_id' => $user_id, // Pass a user_id to limit to only blogs this user has higher than subscriber access to
-        'search_terms' => false // Pass search terms to filter on the blog title or description.
+        'search_terms' => $search_terms // Pass search terms to filter on the blog title or description.
     );
 
     $r = wp_parse_args( $args, $defaults );
     extract( $r );
-
-    // type: active ( default ) | random | newest | alphabetical
-
-    if ( !empty( $_REQUEST['s'] ) )
-        $search_terms = $_REQUEST['s'];
 
     if ( $max ) {
@@ -154 +145 @@
 
     $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
-
     return $blogs_template->has_blogs();
 }

trunk/bp-core/bp-core-templatetags.php

@@ -126 +126 @@
     $user_id = false;
     $page = 1;
+    $search_terms = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-members-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-members-filter'] ) && '-1' != $_COOKIE['bp-members-filter'] )
-        $type = $_COOKIE['bp-members-filter'];
-
-    if ( !empty( $_COOKIE['bp-members-page'] ) && '-1' != $_COOKIE['bp-members-page'] )
-        $page = $_COOKIE['bp-members-page'];
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
+
+    /* Pass a filter if ?s= is set. */
+    if ( $_REQUEST['s'] )
+        $search_terms = $_REQUEST['s'];
 
     // type: active ( default ) | random | newest | popular | online | alphabetical
@@ -148 +146 @@
 
         'user_id' => $user_id, // Pass a user_id to only show friends of this user
-        'search_terms' => false, // Pass search_terms to filter users by their profile data
+        'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
 
         'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
@@ -160 +158 @@
             $per_page = $max;
     }
-
-    /* Pass a filter if ?s= is set. */
-    if ( $_REQUEST['s'] )
-        $search_terms = $_REQUEST['s'];
-
-    if ( false === $user_id && $bp->displayed_user->id )
-        $user_id = $bp->displayed_user->id;
 
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
@@ -1393 +1384 @@
     }
 
-/* This function will pass a AJAX built querystring to a loop in the template */
-function bp_ajax_querystring() {
-    global $bp;
-
-    return apply_filters( 'bp_ajax_querystring', $bp->ajax_querystring );
-}
-
 /* Template is_() functions to determine the current page */
 

trunk/bp-forums/bp-forums-templatetags.php

@@ -163 +163 @@
     $type = 'newest';
     $user_id = false;
-    $page = 1;
+    $forum_id = false;
+    $search_terms = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-forums-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-forums-filter'] ) && '-1' != $_COOKIE['bp-forums-filter'] )
-        $type = $_COOKIE['bp-forums-filter'];
-
-    if ( !empty( $_COOKIE['bp-forums-page'] ) && '-1' != $_COOKIE['bp-forums-page'] )
-        $page = $_COOKIE['bp-forums-page'];
-
-    $defaults = array(
-        'type' => $type,
-        'forum_id' => false,
-        'user_id' => $user_id,
-        'page' => $page,
-        'per_page' => 20,
-        'max' => false,
-        'no_stickies' => false,
-        'search_terms' => false
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r );
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
 
     /* If we're in a single group, set this group's forum_id */
@@ -211 +191 @@
         $search_terms = $_GET['fs'];
 
+    $defaults = array(
+        'type' => $type,
+        'forum_id' => $forum_id,
+        'user_id' => $user_id,
+        'page' => 1,
+        'per_page' => 20,
+        'max' => false,
+        'no_stickies' => false,
+        'search_terms' => $search_terms
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
+
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms );
-
     return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
 }

trunk/bp-groups/bp-groups-templatetags.php

@@ -178 +178 @@
     $type = 'active';
     $user_id = false;
-    $page = 1;
+    $search_terms = false;
+    $slug = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-groups-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-groups-filter'] ) && '-1' != $_COOKIE['bp-groups-filter'] )
-        $type = $_COOKIE['bp-groups-filter'];
-
-    if ( !empty( $_COOKIE['bp-groups-page'] ) && '-1' != $_COOKIE['bp-groups-page'] )
-        $page = $_COOKIE['bp-groups-page'];
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
+
+    /* Type */
+    if ( 'my-groups' == $bp->current_action ) {
+        if ( 'recently-joined' == $order )
+            $type = 'recently-joined';
+        else if ( 'most-popular' == $order )
+            $type = 'popular';
+        else if ( 'admin-of' == $order ) {
+            $type = 'admin-of';
+        } else if ( 'mod-of' == $order ) {
+            $type = 'mod-of';
+        } else if ( 'alphabetically' == $order )
+            $type = 'alphabetical';
+    } else if ( 'invites' == $bp->current_action ) {
+        $type = 'invites';
+    } else if ( $bp->groups->current_group->slug ) {
+        $type = 'single-group';
+        $slug = $bp->groups->current_group->slug;
+    }
+
+    if ( isset( $_REQUEST['group-filter-box'] ) || isset( $_REQUEST['s'] ) )
+        $search_terms = ( isset( $_REQUEST['group-filter-box'] ) ) ? $_REQUEST['group-filter-box'] : $_REQUEST['s'];
 
     $defaults = array(
         'type' => $type,
-        'page' => $page,
+        'page' => 1,
         'per_page' => 20,
         'max' => false,
 
         'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
-        'slug' => false, // Pass a group slug to only return that group
-        'search_terms' => false // Pass search terms to return only matching groups
+        'slug' => $slug, // Pass a group slug to only return that group
+        'search_terms' => $search_terms // Pass search terms to return only matching groups
     );
 
     $r = wp_parse_args( $args, $defaults );
     extract( $r );
-
-    if ( '' == $args ) {
-        /* The following code will auto set parameters based on the page being viewed.
-         * for example on example.com/members/andy/groups/my-groups/most-popular/
-         * $type = 'most-popular'
-         */
-        if ( 'my-groups' == $bp->current_action ) {
-            $order = $bp->action_variables[0];
-            if ( 'recently-joined' == $order )
-                $type = 'recently-joined';
-            else if ( 'most-popular' == $order )
-                $type = 'popular';
-            else if ( 'admin-of' == $order ) {
-                $type = 'admin-of';
-                $user_id = $bp->displayed_user->id;
-            } else if ( 'mod-of' == $order ) {
-                $type = 'mod-of';
-                $user_id = $bp->displayed_user->id;
-            } else if ( 'alphabetically' == $order )
-                $type = 'alphabetical';
-        } else if ( 'invites' == $bp->current_action ) {
-            $type = 'invites';
-        } else if ( $bp->groups->current_group->slug ) {
-            $type = 'single-group';
-            $slug = $bp->groups->current_group->slug;
-        }
-    }
-
-    if ( isset( $_REQUEST['group-filter-box'] ) || isset( $_REQUEST['s'] ) )
-        $search_terms = ( isset( $_REQUEST['group-filter-box'] ) ) ? $_REQUEST['group-filter-box'] : $_REQUEST['s'];
 
     $groups_template = new BP_Groups_Template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms );

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

@@ -10 +10 @@
  */
 
-function bp_dtheme_object_filter() {
-    global $bp;
-
+/***
+ * Each object loop (activity/members/groups/blogs/forums) contains parameters to
+ * show specific information based on the page we are currently looking at.
+ * The following function will take into account any cookies set in the JS and allow us
+ * to override the parameters sent. That way we can change the results returned without reloading the page.
+ */
+function bp_dtheme_ajax_querystring( $object = false ) {
+    global $bp;
+
+    if ( empty( $object ) )
+        return false;
+
+    /* Set up the cookies passed on this AJAX request. Store a local var to avoid conflicts */
+    if ( !empty( $_POST['cookie'] ) )
+        $_BP_COOKIE = wp_parse_args( str_replace( '; ', '&', urldecode( $_POST['cookie'] ) ) );
+    else
+        $_BP_COOKIE = &$_COOKIE;
+
+    $qs = false;
+
+    /***
+     * Check if any cookie values are set. If there are then override the default params passed to the
+     * template loop
+     */
+    if ( !empty( $_BP_COOKIE['bp-' . $object . '-filter'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-filter'] ) {
+        $qs[] = 'type=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+        $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter']; // Activity stream filtering on action
+    }
+
+    if ( !empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
+        if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
+            $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+            $qs[] = 'user_id=' . $user_id;
+        }
+        $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope
+    }
+
+    if ( !empty( $_BP_COOKIE['bp-' . $object . '-page'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-page'] )
+        $qs[] = 'page=' . $_BP_COOKIE['bp-' . $object . '-page'];
+
+    if ( !empty( $_BP_COOKIE['bp-' . $object . '-search-terms'] ) && __( 'Search anything...', 'buddypress' ) != $_BP_COOKIE['bp-' . $object . '-search-terms'] && 'false' != $_BP_COOKIE['bp-' . $object . '-search-terms'] )
+        $qs[] = 'search_terms=' . $_BP_COOKIE['bp-' . $object . '-search-terms'];
+
+    /* Now pass the querystring to override default values. */
+    if ( !empty( $qs ) )
+        return apply_filters( 'bp_dtheme_ajax_querystring', join( '&', (array)$qs ), $object, $_BP_COOKIE['bp-' . $object . '-filter'], $_BP_COOKIE['bp-' . $object . '-scope'], $_BP_COOKIE['bp-' . $object . '-page'], $_BP_COOKIE['bp-' . $object . '-search-terms'], $_BP_COOKIE['bp-' . $object . '-extras'] );
+}
+
+function bp_dtheme_object_template_loader() {
     $object = esc_attr( $_POST['object'] );
-    $filter = esc_attr( $_POST['filter'] );
-    $page = esc_attr( $_POST['page'] );
-    $search_terms = esc_attr( $_POST['search_terms'] );
-
-    /**
-     * Scope is the scope of results to use, either all (everything) or personal (just mine).
-     * For example if the object is groups, it would be all groups, or just groups I belong to.
-     */
-    $scope = esc_attr( $_POST['scope'] );
-
-    /* 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 ( empty( $filter ) )
-        $filter = 'active';
-
-    $bp->ajax_querystring = 'type=' . $filter . '&page=' . $page;
-
-    if ( !empty( $search_terms ) )
-        $bp->ajax_querystring .= '&search_terms=' . $search_terms;
-
-    if ( $scope == 'personal' || $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( "$object/$object-loop.php" ), true );
 }
-add_action( 'wp_ajax_members_filter', 'bp_dtheme_object_filter' );
-add_action( 'wp_ajax_groups_filter', 'bp_dtheme_object_filter' );
-add_action( 'wp_ajax_blogs_filter', 'bp_dtheme_object_filter' );
-add_action( 'wp_ajax_forums_filter', 'bp_dtheme_object_filter' );
+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' );
+
+function bp_dtheme_activity_template_loader() {
+    global $bp;
+
+    /* Buffer the loop in the template to a var for JS to spit out. */
+    ob_start();
+    locate_template( array( 'activity/activity-loop.php' ), true );
+    $result['contents'] = ob_get_contents();
+    ob_end_clean();
+
+    echo json_encode( $result );
+}
+add_action( 'wp_ajax_activity_widget_filter', 'bp_dtheme_activity_template_loader' );
+add_action( 'wp_ajax_activity_get_older_updates', 'bp_dtheme_activity_template_loader' );
 
 function bp_dtheme_post_update() {
@@ -178 +206 @@
 add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
 
-function bp_dtheme_activity_loop( $scope = false, $filter = false, $per_page = 20, $page = 1 ) {
-    global $bp;
-
-    /* If we are on a profile page we only want to show that users activity */
-    if ( $bp->displayed_user->id ) {
-        $query_string = 'user_id=' . $bp->displayed_user->id;
-    } else {
-        if ( !empty( $bp->groups->current_group ) )
-            $scope = 'all';
-
-        $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
-
-        switch ( $scope ) {
-            case BP_FRIENDS_SLUG:
-                $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
-                $query_string = 'user_id=' . $friend_ids;
-                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/' . BP_FRIENDS_SLUG . '/feed/';
-                break;
-            case BP_GROUPS_SLUG:
-                $groups = groups_get_user_groups( $bp->loggedin_user->id );
-                $group_ids = implode( ',', $groups['groups'] );
-                $query_string = 'object=groups&primary_id=' . $group_ids . '&show_hidden=1';
-                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/' . BP_GROUPS_SLUG . '/feed/';
-                break;
-            case 'favorites':
-                $favs = bp_activity_get_user_favorites( $bp->loggedin_user->id );
-
-                if ( empty( $favs ) )
-                    $favorite_ids = false;
-
-                $favorite_ids = implode( ',', (array)$favs );
-                $query_string = 'include=' . $favorite_ids;
-                $feed_url = $bp->loggedin_user->domain  . BP_ACTIVITY_SLUG . '/favorites/feed/';
-                break;
-            case 'mentions':
-                $query_string = 'show_hidden=1&search_terms=@' . bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
-                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/mentions/feed/';
-
-                /* Reset the number of new @ mentions for the user */
-                delete_usermeta( $bp->loggedin_user->id, 'bp_new_mention_count' );
-                break;
-        }
-    }
-
-    /* Build the filter */
-    if ( $filter && $filter != '-1' )
-        $query_string .= '&action=' . $filter;
-
-    /* If we are viewing a group then filter the activity just for this group */
-    if ( !empty( $bp->groups->current_group ) ) {
-        $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;
-
-        /* If we're viewing a non-private group and the user is a member, show the hidden activity for the group */
-        if ( 'public' != $bp->groups->current_group->status && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
-            $query_string .= '&show_hidden=1';
-    }
-
-    /* Add the per_page param */
-    $query_string .= '&per_page=' . $per_page;
-
-    /* Add the comments param */
-    if ( $bp->displayed_user->id || 'mentions' == $scope )
-        $query_string .= '&display_comments=stream';
-    else
-        $query_string .= '&display_comments=threaded';
-
-    /* Add the new page param */
-    $args = explode( '&', trim( $query_string ) );
-    foreach( (array)$args as $arg ) {
-        if ( false === strpos( $arg, 'page' ) )
-            $new_args[] = $arg;
-    }
-    $query_string = implode( '&', $new_args ) . '&page=' . $page;
-
-    $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_activity_filter', $query_string, $scope );
-    $result['query_string'] = $bp->ajax_querystring;
-    $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. */
-    ob_start();
-    locate_template( array( 'activity/activity-loop.php' ), true );
-    $result['contents'] = ob_get_contents();
-    ob_end_clean();
-
-    echo json_encode( $result );
-}
-
-function bp_dtheme_ajax_widget_filter() {
-    bp_dtheme_activity_loop( $_POST['scope'], $_POST['filter'] );
-}
-add_action( 'wp_ajax_activity_widget_filter', 'bp_dtheme_ajax_widget_filter' );
-
-function bp_dtheme_ajax_load_older_updates() {
-    bp_dtheme_activity_loop( false, false, 20, $_POST['page'] );
-}
-add_action( 'wp_ajax_activity_get_older_updates', 'bp_dtheme_ajax_load_older_updates' );
-
 function bp_dtheme_mark_activity_favorite() {
     global $bp;

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

@@ -3 +3 @@
 
 // Global variable to prevent multiple AJAX requests
-var activity_request = null;
+var bp_ajax_request = null;
 
 j(document).ready( function() {
@@ -112 +112 @@
 
         /* Reset the page */
-        j.cookie( 'bp-activity-oldestpage', 1 );
+        j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
 
         /* Activity Stream Tabs */
@@ -131 +131 @@
 
         if ( !selected_tab.length )
-            var scope = 'all';
+            var scope = null;
         else
             var scope = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
@@ -232 +232 @@
 
             if ( null == j.cookie('bp-activity-oldestpage') )
-                j.cookie('bp-activity-oldestpage', 1 );
+                j.cookie('bp-activity-oldestpage', 1, {path: '/'} );
 
             var oldest_page = ( j.cookie('bp-activity-oldestpage') * 1 ) + 1;
@@ -244 +244 @@
             {
                 j("li.load-more").removeClass('loading');
-                j.cookie( 'bp-activity-oldestpage', oldest_page );
+                j.cookie( 'bp-activity-oldestpage', oldest_page, {path: '/'} );
                 j("ul.activity-list").append(response.contents);
 
@@ -1032 +1032 @@
 function bp_init_activity() {
     /* Reset the page */
-    j.cookie( 'bp-activity-oldestpage', 1 );
+    j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
 
     if ( null != j.cookie('bp-activity-filter') && j('#activity-filter-select').length )
@@ -1071 +1071 @@
         return false;
 
-    if ( null == scope )
-        var scope = 'all';
-
-    if ( null == filter )
-        var filter = 'active';
-
-    if ( null == page )
-        var page = 1;
-
-    if ( null == search_terms )
-        var search_terms = false;
-
-    if ( null == extras )
-        var extras = false;
-
     if ( j.query.get('s') )
         search_terms = j.query.get('s');
 
     /* Save the type and filter to a session cookie */
-    j.cookie( 'bp-' + object + '-scope', scope, null );
-    j.cookie( 'bp-' + object + '-filter', filter, null );
-    j.cookie( 'bp-' + object + '-page', page, null );
-    j.cookie( 'bp-' + object + '-search-terms', search_terms, null );
-    j.cookie( 'bp-' + object + '-extras', extras, null );
+    j.cookie( 'bp-' + object + '-scope', scope, {path: '/'}  );
+    j.cookie( 'bp-' + object + '-filter', filter, {path: '/'}  );
+    j.cookie( 'bp-' + object + '-page', page, {path: '/'}  );
+    j.cookie( 'bp-' + object + '-search-terms', search_terms, {path: '/'}  );
+    j.cookie( 'bp-' + object + '-extras', extras, {path: '/'}  );
 
     /* Set the correct selected nav and filter */
-    j('div.item-list-tabs li').each( function() {
-        j(this).removeClass('selected');
-    });
-    j('div.item-list-tabs li#' + object + '-' + scope + ', div.item-list-tabs#object-nav li.current').addClass('selected');
+    if ( null != scope ) {
+        j('div.item-list-tabs li').each( function() {
+            j(this).removeClass('selected');
+        });
+        j('div.item-list-tabs li#' + object + '-' + scope + ', div.item-list-tabs#object-nav li.current').addClass('selected');
+    }
     j('div.item-list-tabs li.selected').addClass('loading');
     j('div.item-list-tabs select option[value=' + filter + ']').attr( 'selected', 'selected' );
@@ -1107 +1094 @@
         object = 'members';
 
-    j.post( ajaxurl, {
+    if ( bp_ajax_request )
+        bp_ajax_request.abort();
+
+    bp_ajax_request = j.post( ajaxurl, {
         action: object + '_filter',
         'cookie': encodeURIComponent(document.cookie),
@@ -1129 +1119 @@
 /* Activity Loop Requesting */
 function bp_activity_request(scope, filter) {
-    if ( null == scope )
-        var scope = 'all';
-
-    if ( null == filter )
-        var filter = '-1';
-
     /* Save the type and filter to a session cookie */
-    j.cookie( 'bp-activity-scope', scope, null );
-    j.cookie( 'bp-activity-filter', filter, null );
-    j.cookie( 'bp-activity-oldestpage', 1 );
+    j.cookie( 'bp-activity-scope', scope, {path: '/'}  );
+    j.cookie( 'bp-activity-filter', filter, {path: '/'} );
+    j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
 
     /* Remove selected and loading classes from tabs */
-    j('div.item-list-tabs li').each( function() {
-        j(this).removeClass('selected loading');
-    });
-
-    /* Set the correct selected nav and filter */
-    j('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
+    if ( null != scope ) {
+        j('div.item-list-tabs li').each( function() {
+            j(this).removeClass('selected loading');
+        });
+        /* Set the correct selected nav and filter */
+        j('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
+    }
     j('div#object-nav.item-list-tabs li.selected, div.activity-type-tabs li.selected').addClass('loading');
     j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
@@ -1153 +1138 @@
     j('.widget_bp_activity_widget h2 span.ajax-loader').show();
 
-    if ( activity_request )
-        activity_request.abort();
-
-    activity_request = j.post( ajaxurl, {
+    if ( bp_ajax_request )
+        bp_ajax_request.abort();
+
+    bp_ajax_request = j.post( ajaxurl, {
         action: 'activity_widget_filter',
         'cookie': encodeURIComponent(document.cookie),
@@ -1251 +1236 @@
 
 /* jQuery Cookie plugin */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o.5=B(9,b,2){6(h b!=\'E\'){2=2||{};6(b===n){b=\'\';2.3=-1}4 3=\'\';6(2.3&&(h 2.3==\'j\'||2.3.k)){4 7;6(h 2.3==\'j\'){7=w u();7.t(7.q()+(2.3*r*l*l*x))}m{7=2.3}3=\'; 3=\'+7.k()}4 8=2.8?\'; 8=\'+(2.8):\'\';4 a=2.a?\'; a=\'+(2.a):\'\';4 c=2.c?\'; c\':\'\';d.5=[9,\'=\',C(b),3,8,a,c].y(\'\')}m{4 e=n;6(d.5&&d.5!=\'\'){4 g=d.5.A(\';\');s(4 i=0;i<g.f;i++){4 5=o.z(g[i]);6(5.p(0,9.f+1)==(9+\'=\')){e=D(5.p(9.f+1));v}}}F e}};',42,42,'||options|expires|var|cookie|if|date|path|name|domain|value|secure|document|cookieValue|length|cookies|typeof||number|toUTCString|60|else|null|jQuery|substring|getTime|24|for|setTime|Date|break|new|1000|join|trim|split|function|encodeURIComponent|decodeURIComponent|undefined|return'.split('|'),0,{}))
+jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
 
 /* jQuery querystring plugin */

trunk/bp-themes/bp-default/activity/activity-loop.php

@@ -3 +3 @@
 <?php do_action( 'bp_before_activity_loop' ) ?>
 
-<?php if ( bp_has_activities( bp_ajax_querystring() ) ) : ?>
+<?php if ( bp_has_activities( bp_dtheme_ajax_querystring( 'activity' ) ) ) : ?>
 
     <?php /* Show pagination if JS is not enabled, since the "Load More" link will do nothing */ ?>

trunk/bp-themes/bp-default/blogs/blogs-loop.php

@@ -3 +3 @@
 <?php do_action( 'bp_before_blogs_loop' ) ?>
 
-<?php if ( bp_has_blogs( bp_ajax_querystring() ) ) : ?>
+<?php if ( bp_has_blogs( bp_dtheme_ajax_querystring( 'blogs' ) ) ) : ?>
 
     <div class="pagination">

trunk/bp-themes/bp-default/forums/forums-loop.php

@@ -1 @@
-<?php if ( bp_has_forum_topics( bp_ajax_querystring() ) ) : ?>
+<?php if ( bp_has_forum_topics( bp_dtheme_ajax_querystring( 'forums' ) ) ) : ?>
 
     <div class="pagination">

trunk/bp-themes/bp-default/groups/groups-loop.php

@@ -3 +3 @@
 <?php do_action( 'bp_before_groups_loop' ) ?>
 
-<?php if ( bp_has_groups( bp_ajax_querystring() ) ) : ?>
+<?php if ( bp_has_groups( bp_dtheme_ajax_querystring( 'groups' ) ) ) : ?>
 
     <div class="pagination">

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

@@ -3 +3 @@
 <?php do_action( 'bp_before_members_loop' ) ?>
 
-<?php if ( bp_has_members( bp_ajax_querystring() ) ) : ?>
+<?php if ( bp_has_members( bp_dtheme_ajax_querystring( 'members' ) ) ) : ?>
 
     <div class="pagination">