Changeset 1839 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

09/10/2009 01:24:01 AM (17 years ago)

Author:

apeatling

Message:

Added support for significantly more advanced activity stream filtering.

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (6 diffs)

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

@@ -17 +17 @@
     var $full_name;
 
-    function bp_activity_template( $type, $user_id, $per_page, $max, $timeframe, $filter ) {
+    function bp_activity_template( $type, $user_id, $per_page, $max, $filter ) {
         global $bp;
 
@@ -28 +28 @@
         
         if ( $type == 'personal' )
-            $this->activities = bp_activity_get_user_activity( $user_id, $max, $timeframe, $this->pag_num, $this->pag_page, $filter );
+            $this->activities = bp_activity_get_user_activity( $user_id, $max, $this->pag_num, $this->pag_page, $filter );
 
         if ( $type == 'friends' && ( bp_is_home() || is_site_admin() || $bp->loggedin_user->id == $user_id ) )
-            $this->activities = bp_activity_get_friends_activity( $user_id, $max, $timeframe, false, $this->pag_num, $this->pag_page, $filter );
+            $this->activities = bp_activity_get_friends_activity( $user_id, $max, false, $this->pag_num, $this->pag_page, $filter );
         
         if ( !$max || $max >= (int)$this->activities['total'] )
@@ -89 +89 @@
             return true;
         } elseif ( $this->current_activity + 1 == $this->activity_count ) {
-            do_action('loop_end');
+            do_action('activity_loop_end');
             // Do some cleaning up after the loop
             $this->rewind_activities();
@@ -108 +108 @@
 
         if ( $this->current_activity == 0 ) // loop has just started
-            do_action('loop_start');
+            do_action('activity_loop_start');
     }
 }
@@ -125 +125 @@
 function bp_has_activities( $args = '' ) {
     global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
-
+    
+    /* Note: any params used for filtering can be a single value, or multiple values comma seperated. */
+    
     $defaults = array(
         'type' => 'sitewide',
-        'user_id' => false,
         'per_page' => 25,
         'max' => false,
-        'timeframe' => '-4 weeks',
-        'filter' => false
+        'user_id' => false, // user_id to filter on
+        'object' => false, // object to filter on e.g. groups, profile, status, friends
+        'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated
+        'primary_id' => false, // 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
     );
 
@@ -162 +166 @@
     
     if ( isset( $_GET['afilter'] ) )
-        $filter = $_GET['afilter'];
-
-    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $timeframe, $filter );       
+        $filter = array( 'object' => $_GET['afilter'] );
+    else
+        $filter = array( 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
+    
+    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $filter );       
     return $activities_template->has_activities();
 }