Changeset 2128 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

11/25/2009 08:38:56 PM (17 years ago)

Author:

apeatling

Message:

Activity stream commenting updates

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (12 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -163 +163 @@
         }
 
-        function get_activity_for_user( $user_id, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false ) {
+        function get_activity_for_user( $user_id, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
                 global $wpdb, $bp;
 
@@ -247 +247 @@
         }
 
-        function get_sitewide_activity( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false ) {
-                global $wpdb, $bp;
+        function get_sitewide_activity( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
+                global $wpdb, $bp;
+
+                $where_conditions = array();
 
                 if ( $per_page && $page )
@@ -259 +261 @@
                 if ( $search_terms ) {
                         $search_terms = $wpdb->escape( $search_terms );
-                        $search_sql = "AND content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+                        $where_conditions['search_sql'] = "content LIKE '%%" . like_escape( $search_terms ) . "%%'";
                 }
 
                 /* Filtering */
-                if ( $filter )
-                        $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
+                if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
+                        $where_conditions['filter_sql'] = $filter_sql;
 
                 /* Sorting */
@@ -270 +272 @@
                         $sort = 'DESC';
 
+                /* Hide Hidden Items? */
+                if ( !$show_hidden )
+                        $where_conditions['hidden_sql'] = "hide_sitewide = 0";
+
                 /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
                 if ( !$display_comments || 'threaded' == $display_comments ) {
+                        $where_conditions[] = "component_action != 'activity_comment'";
+                        $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
                         if ( $per_page && $page && $max )
-                                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+                                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
                         else
-                                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
-
-                        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$max_sql}" ) );
+                                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
+
+                        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
 
                         if ( $activities && $display_comments )
@@ -286 +295 @@
                          * we will need to do things slightly differently.
                          */
+                        if ( !empty( $where_conditions ) )
+                                $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
                          if ( !empty( $filter_sql ) ) {
-                                $all_activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort}" ) );
+                                $all_activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort}" ) );
 
                                 foreach ( (array)$all_activities as $activity ) {
@@ -296 +308 @@
 
                                 /* Fetch the comments for the activity items */
-                                $all_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 AND item_id IN ({$activity_ids}) {$search_sql} ORDER BY id {$sort}" ) );
+                                $search_sql = $where_conditions['search_sql'];
+                                $all_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE item_id IN ({$activity_ids}) {$search_sql} ORDER BY id {$sort}" ) );
 
                                 foreach ( (array)$all_comments as $comment ) {
@@ -313 +326 @@
                          } else {
                                 if ( $per_page && $page && $max )
-                                        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort} {$pag_sql}" ) );
+                                        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort} {$pag_sql}" ) );
                                 else
-                                        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort} {$pag_sql} {$max_sql}" ) );
-
-                                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+                                        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort} {$pag_sql} {$max_sql}" ) );
+
+                                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
                          }
 
@@ -449 +462 @@
                 if ( !empty( $filter_array['object'] ) ) {
                         $object_filter = explode( ',', $filter_array['object'] );
-                        $object_sql = ' AND ( ';
+                        $object_sql = ' ( ';
 
                         $counter = 1;
@@ -462 +475 @@
 
                         $object_sql .= ' )';
+                        $filter_sql[] = $object_sql;
                 }
 
                 if ( !empty( $filter_array['action'] ) ) {
                         $action_filter = explode( ',', $filter_array['action'] );
-                        $action_sql = ' AND ( ';
+                        $action_sql = ' ( ';
 
                         $counter = 1;
@@ -479 +493 @@
 
                         $action_sql .= ' )';
+                        $filter_sql[] = $action_sql;
                 }
 
                 if ( !empty( $filter_array['primary_id'] ) ) {
                         $pid_filter = explode( ',', $filter_array['primary_id'] );
-                        $pid_sql = ' AND ( ';
+                        $pid_sql = ' ( ';
 
                         $counter = 1;
@@ -496 +511 @@
 
                         $pid_sql .= ' )';
+                        $filter_sql[] = $pid_sql;
                 }
 
                 if ( !empty( $filter_array['secondary_id'] ) ) {
                         $sid_filter = explode( ',', $filter_array['secondary_id'] );
-                        $sid_sql = ' AND ( ';
+                        $sid_sql = ' ( ';
 
                         $counter = 1;
@@ -513 +529 @@
 
                         $sid_sql .= ' )';
-                }
-
-                return $object_sql . $action_sql . $pid_sql . $sid_sql;
+                        $filter_sql[] = $sid_sql;
+                }
+
+                if ( empty($filter_sql) )
+                        return false;
+
+                return join( ' AND ', $filter_sql );
         }