Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
06/25/2009 06:41:09 PM (17 years ago)
Author:
apeatling
Message:

Fixing legacy is_private use in bp-activity.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1566 r1586  
    160160            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
    161161       
    162         if ( !bp_is_home() )
    163             $privacy_sql = " AND is_private = 0";
    164 
    165162        if ( $limit && $page && $max )
    166163            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d AND date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC $pag_sql", $user_id, $since ) );
    … …  
    170167        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d AND date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC $max_sql", $user_id, $since ) );
    171168
    172         for ( $i = 0; $i < count( $activities ); $i++ ) {
    173             if ( !$activities[$i]->is_private ) {
    174                 $activities_formatted[$i]['content'] = $activities[$i]->content;
    175                 $activities_formatted[$i]['primary_link'] = $activities[$i]->primary_link;
    176                 $activities_formatted[$i]['date_recorded'] = $activities[$i]->date_recorded;
    177                 $activities_formatted[$i]['component_name'] = $activities[$i]->component_name;
    178                 $activities_formatted[$i]['component_action'] = $activities[$i]->component_action;
    179                 $activities_formatted[$i]['is_private'] = $activities[$i]->is_private;
    180             }
    181         }
    182        
    183         return array( 'activities' => $activities_formatted, 'total' => (int)$total_activities );
    184     }
    185    
    186     function get_activity_for_friends( $user_id, $max_items, $since, $max_items_per_friend, $limit, $page ) {
    187         global $wpdb, $bp;
    188        
    189         // TODO: Max items per friend not yet implemented.
    190        
    191         if ( !function_exists('friends_get_friend_user_ids') )
    192             return false;
    193 
    194         if ( $limit && $page )
    195             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    196        
    197         if ( $max )
    198             $max_sql = $wpdb->prepare( "LIMIT %d", $max );
    199            
    200         $since = strtotime($since);
    201 
    202         $friend_ids = friends_get_friend_user_ids( $user_id );
    203 
    204         if ( !$friend_ids )
    205             return false;
    206            
    207         $friend_ids = implode( ',', $friend_ids );
    208        
    209         if ( $limit && $page && $max )
    210             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $pag_sql", $since ) );
    211         else
    212             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $pag_sql $max_sql", $since ) );             
    213        
    214         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $max_sql", $since ) );
    215        
    216         return array( 'activities' => $activities, 'total' => (int)$total_activities );
    217     }
    218    
    219     function get_sitewide_activity( $max, $limit, $page ) {
    220         global $wpdb, $bp;
    221        
    222         if ( $limit && $page )
    223             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    224        
    225         if ( $max )
    226             $max_sql = $wpdb->prepare( "LIMIT %d", $max );
    227        
    228         if ( $limit && $page && $max )
    229             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $pag_sql" ) );
    230         else
    231             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
    232 
    233         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $max_sql" ) );
    234        
    235169        for ( $i = 0; $i < count( $activities ); $i++ ) {
    236170            $activities_formatted[$i]['content'] = $activities[$i]->content;
    … …  
    240174            $activities_formatted[$i]['component_action'] = $activities[$i]->component_action;
    241175        }
     176       
     177        return array( 'activities' => $activities_formatted, 'total' => (int)$total_activities );
     178    }
     179   
     180    function get_activity_for_friends( $user_id, $max_items, $since, $max_items_per_friend, $limit, $page ) {
     181        global $wpdb, $bp;
     182       
     183        // TODO: Max items per friend not yet implemented.
     184       
     185        if ( !function_exists('friends_get_friend_user_ids') )
     186            return false;
     187
     188        if ( $limit && $page )
     189            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
     190       
     191        if ( $max )
     192            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
     193           
     194        $since = strtotime($since);
     195
     196        $friend_ids = friends_get_friend_user_ids( $user_id );
     197
     198        if ( !$friend_ids )
     199            return false;
     200           
     201        $friend_ids = implode( ',', $friend_ids );
     202       
     203        if ( $limit && $page && $max )
     204            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $pag_sql", $since ) );
     205        else
     206            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $pag_sql $max_sql", $since ) );             
     207       
     208        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $max_sql", $since ) );
     209       
     210        return array( 'activities' => $activities, 'total' => (int)$total_activities );
     211    }
     212   
     213    function get_sitewide_activity( $max, $limit, $page ) {
     214        global $wpdb, $bp;
     215       
     216        if ( $limit && $page )
     217            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
     218       
     219        if ( $max )
     220            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
     221       
     222        if ( $limit && $page && $max )
     223            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $pag_sql" ) );
     224        else
     225            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
     226
     227        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 ORDER BY date_recorded DESC $max_sql" ) );
     228       
     229        for ( $i = 0; $i < count( $activities ); $i++ ) {
     230            $activities_formatted[$i]['content'] = $activities[$i]->content;
     231            $activities_formatted[$i]['primary_link'] = $activities[$i]->primary_link;
     232            $activities_formatted[$i]['date_recorded'] = $activities[$i]->date_recorded;
     233            $activities_formatted[$i]['component_name'] = $activities[$i]->component_name;
     234            $activities_formatted[$i]['component_action'] = $activities[$i]->component_action;
     235        }
    242236
    243237        return array( 'activities' => $activities_formatted, 'total' => (int)$total_activities );
Note: See TracChangeset for help on using the changeset viewer.