Skip to:
Content

BuddyPress.org

Changeset 431


Ignore:
Timestamp:
10/23/2008 07:19:11 PM (17 years ago)
Author:
apeatling
Message:
  • Fixed broken group wire posting
  • Fixed AJAX functionality across BuddyPress to work with the new member URLs
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-core.php

    r430 r431  
    11<?php
     2
    23/* Define the current version number for checking if DB tables are up to date. */
    34define( 'BP_CORE_VERSION', '0.2.6.1' );
    … …  
    6465    global $current_userid;
    6566    global $action_variables;
    66 
     67   
    6768    /* The domain for the root of the site where the main blog resides */   
    6869    $bp['root_domain'] = bp_core_get_root_domain();
    … …  
    924925}
    925926
     927function bp_core_referer() {
     928    $referer = explode( '/', $_SERVER['HTTP_REFERER'] );
     929    unset( $referer[0], $referer[1], $referer[2] );
     930    return implode( '/', $referer );
     931}
     932
    926933function bp_core_remove_data( $user_id ) {
    927934    /* Remove usermeta */

  • trunk/bp-core/bp-core-ajax-handler.php

    r394 r431  
    11<?php
    22define('DOING_AJAX', true);
    3 require_once( dirname(dirname(dirname(dirname(__FILE__)))) . '/wp-load.php' );
     3require_once( dirname( dirname( dirname( dirname(__FILE__) ) ) ) . '/wp-load.php' );
     4
     5add_filter( 'bp_uri', 'bp_core_referer' );
     6wp();
    47
    58do_action( 'wp_ajax_' . $_POST['action'] );
     9
     10/* Head shot! */
    611die('0');
    712?>

  • trunk/bp-core/bp-core-ajax.php

    r394 r431  
    55
    66    check_ajax_referer('bp_core_widget_members');
    7 
    8     if ( !$bp ) {
    9         bp_core_setup_globals();
    10        
    11         if ( function_exists('friends_install') )
    12             friends_setup_globals();
    13     }
    147   
    158    switch ( $_POST['filter'] ) {
    … …  
    6861
    6962    check_ajax_referer('directory_members');
    70 
    71     if ( !$bp ) {
    72         bp_core_setup_globals();
    73        
    74         if ( function_exists('friends_install') )
    75             friends_setup_globals();
    76     }
    7763   
    7864    $users = BP_Core_User::get_users_by_letter( $_POST['letter'] );

  • trunk/bp-core/bp-core-catchuri.php

    r430 r431  
    3131    global $is_member_page;
    3232   
     33    $path = apply_filters( 'bp_uri', $_SERVER['REQUEST_URI'] );
     34   
    3335    /* Fetch the current URI and explode each part seperated by '/' into an array */
    34     $bp_uri = explode( "/", $_SERVER['REQUEST_URI'] );
     36    $bp_uri = explode( "/", $path );
    3537   
    3638    /* Take empties off the end of complete URI */
    … …  
    6971    /* Reset the keys by merging with an empty array */
    7072    $bp_uri = array_merge( array(), $bp_uri ); 
    71    
     73
    7274    if ( $bp_uri[0] == 'members' && $bp_uri[1] != '' ) {
    7375        $is_member_page = true;

  • trunk/bp-core/directories/bp-core-directory-members.php

    r394 r431  
    11<?
    2 function bp_core_directoy_members_setup() {
     2function bp_core_directory_members_setup() {
    33    global $bp, $current_blog;
    44   
    5     // if ( $bp['current_component'] == 'members' && $current_blog->blog_id == 1 ) {
    6     //      add_action( 'bp_template_content', 'bp_core_directory_members_content' );
    7     //      add_action( 'bp_template_sidebar', 'bp_core_directory_members_sidebar' );
    8     //     
    9     //      wp_enqueue_script( 'bp-core-directory-members', site_url() . '/wp-content/mu-plugins/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
    10     //      wp_enqueue_style( 'bp-core-directory-members', site_url() . '/wp-content/mu-plugins/bp-core/css/directory-members.css' );
    11     //     
    12     //      if ( file_exists( TEMPLATEPATH . '/plugin-template.php' ) )
    13     //          bp_catch_uri('plugin-template');
    14     //      else
    15     //          wp_die( __( 'To enable the member directory you must drop the "plugin-template.php and plugin-sidebar.php" files into your theme directory.', 'buddypress' ) );
    16     //  }
     5    if ( $bp['current_component'] == 'members' && $bp['current_action'] == '' ) {
     6        add_action( 'bp_template_content', 'bp_core_directory_members_content' );
     7        add_action( 'bp_template_sidebar', 'bp_core_directory_members_sidebar' );
     8       
     9        wp_enqueue_script( 'bp-core-directory-members', site_url() . '/wp-content/mu-plugins/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
     10        wp_enqueue_style( 'bp-core-directory-members', site_url() . '/wp-content/mu-plugins/bp-core/css/directory-members.css' );
     11       
     12        if ( file_exists( TEMPLATEPATH . '/plugin-template.php' ) )
     13            bp_catch_uri('plugin-template');
     14        else
     15            wp_die( __( 'To enable the member directory you must drop the "plugin-template.php and plugin-sidebar.php" files into your theme directory.', 'buddypress' ) );
     16    }
    1717}
    18 add_action( 'wp', 'bp_core_directoy_members_setup', 5 );
     18add_action( 'wp', 'bp_core_directory_members_setup', 5 );
    1919
    2020function bp_core_directory_members_content() {
    … …  
    6666            <ul id="members-list" class="item-list">
    6767            <?php foreach ( $users as $user ) : ?>
     68                <?php $user_obj = new BP_Core_User( $user->user_id, true ); ?>
    6869                <li>
    6970                    <div class="item-avatar">
    70                         <?php echo bp_core_get_avatar( $user->user_id, 1 ) ?>
     71                        <?php echo $user_obj->avatar_thumb ?>
    7172                    </div>
    7273
    7374                    <div class="item">
    74                         <div class="item-title"><?php echo bp_core_get_userlink( $user->user_id ) ?></div>
    75                         <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __('registered '), __(' ago') ) ?></span></div>
     75                        <div class="item-title"><?php echo $user_obj->user_link ?></div>
     76                        <div class="item-meta"><span class="activity"><?php echo $user_obj->last_active ?></span></div>
     77                    </div>
     78                   
     79                    <div class="action">
     80                        <?php bp_add_friend_button( $user_obj->id ) ?>
     81                        <?php if ( $user_obj->total_friends ) echo $user_obj->total_friends ?>
     82                        <?php if ( $user_obj->total_blogs ) echo $user_obj->total_blogs ?>
     83                        <?php if ( $user_obj->total_groups ) echo $user_obj->total_groups ?>
    7684                    </div>
    7785                   

  • trunk/bp-friends/bp-friends-ajax.php

    r391 r431  
    66    check_ajax_referer('friend_search');
    77
    8     if ( !$bp ) {
    9         bp_core_setup_globals();
    10         friends_setup_globals();
    11        
    12         if ( function_exists('xprofile_setup_globals') )
    13             xprofile_setup_globals();
    14     }
    15    
    168    $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
    179    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 5;
    … …  
    6557   
    6658    check_ajax_referer('finder_search');
    67 
    68     if ( !$bp ) {
    69         bp_core_setup_globals();
    70         friends_setup_globals();
    71        
    72         if ( function_exists('xprofile_setup_globals') )
    73             xprofile_setup_globals();
    74     }
    7559       
    7660    $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
    … …  
    126110function friends_ajax_addremove_friend() {
    127111    global $bp;
    128    
    129     if ( !$bp ) {
    130         bp_core_setup_globals();
    131         friends_setup_globals();
    132     }
    133112
    134113    if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'is_friend' ) {

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

    r373 r431  
    112112        global $wpdb, $bp;
    113113       
     114        /* This is stored in 'total_friend_count' usermeta.
     115           This function will recalculate, update and return. */
     116       
    114117        if ( !$user_id )
    115118            $user_id = $bp['current_userid'];
    116            
    117         if ( !$friend_count = get_usermeta( $user_id, 'total_friend_count') ) {
    118             update_usermeta( $user_id, 'total_friend_count', 0 );
    119            
    120             $sql = $wpdb->prepare( "SELECT count(id) FROM " . $bp['friends']['table_name'] . " WHERE (initiator_user_id = %d OR friend_user_id = %d) AND is_confirmed = 1", $user_id, $user_id );
    121 
    122             if ( !$friend_count = $wpdb->get_var( $sql ) )
    123                 return 0;
    124        
    125             if ( !$friend_count )
    126                 return 0;
    127            
    128             update_usermeta( $user_id, 'total_friend_count', $friend_count );
    129         }
     119       
     120        $sql = $wpdb->prepare( "SELECT count(id) FROM " . $bp['friends']['table_name'] . " WHERE (initiator_user_id = %d OR friend_user_id = %d) AND is_confirmed = 1", $user_id, $user_id );
     121
     122        if ( !$friend_count = $wpdb->get_var( $sql ) )
     123            return 0;
     124   
     125        if ( !$friend_count )
     126            return 0;
     127       
     128        update_usermeta( $user_id, 'total_friend_count', $friend_count );
    130129       
    131130        return $friend_count;
    … …  
    145144
    146145        // filter the user_ids based on the search criteria.
    147         if ( BP_XPROFILE_IS_INSTALLED ) {
     146        if ( function_exists('xprofile_install') ) {
    148147            $sql = $wpdb->prepare( "SELECT DISTINCT user_id as id FROM " . $bp['profile']['table_name_data'] . " WHERE user_id IN ($fids) AND value LIKE '$filter%%'" );
    149148        } else {

  • trunk/bp-groups/bp-groups-ajax.php

    r391 r431  
    44
    55    check_ajax_referer('invite_user');
    6 
    7     if ( !$bp ) {
    8         bp_core_setup_globals();
    9         groups_setup_globals();
    10        
    11         if ( function_exists('friends_setup_globals') )
    12             friends_setup_globals();
    13        
    14         if ( function_exists('xprofile_setup_globals') )
    15             xprofile_setup_globals();
    16     }
    176
    187    if ( !$_POST['friend_id'] || !$_POST['friend_action'] || !$_POST['group_id'] )
    … …  
    5645    check_ajax_referer('group_search');
    5746
    58     if ( !$bp ) {
    59         bp_core_setup_globals();
    60         groups_setup_globals();
    61     }
    62    
    6347    $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
    6448    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 5;
    … …  
    11498    check_ajax_referer('groupfinder_search');
    11599
    116     if ( !$bp ) {
    117         bp_core_setup_globals();
    118         groups_setup_globals();
    119     }
    120    
    121100    $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
    122101    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 5;
    … …  
    171150    check_ajax_referer('groups_widget_groups_list');
    172151
    173     if ( !$bp ) {
    174         bp_core_setup_globals();
    175         groups_setup_globals();
    176     }
    177    
    178152    switch ( $_POST['filter'] ) {
    179153        case 'newest-groups':

  • trunk/bp-messages/bp-messages-ajax.php

    r391 r431  
    66    check_ajax_referer('messages_sendreply');
    77   
    8     if ( !$bp ) {
    9         bp_core_setup_globals();
    10         messages_setup_globals();
    11     }
    12 
    138    $result = messages_send_message($_REQUEST['send_to'], $_REQUEST['subject'], $_REQUEST['content'], $_REQUEST['thread_id'], true, false, true);
    149
    … …  
    3429function messages_ajax_markunread() {
    3530    global $bp;
    36    
    37     if ( !$bp ) {
    38         bp_core_setup_globals();
    39         messages_setup_globals();
    40     }
    41    
     31
    4232    if ( !isset($_POST['thread_ids']) ) {
    4333        echo "-1|" . __('There was a problem marking messages as unread.', 'buddypress');
    … …  
    5545    global $bp;
    5646   
    57     if ( !$bp ) {
    58         bp_core_setup_globals();
    59         messages_setup_globals();
    60     }
    61    
    6247    if ( !isset($_POST['thread_ids']) ) {
    6348        echo "-1|" . __('There was a problem marking messages as read.', 'buddypress');
    … …  
    7459function messages_ajax_delete() {
    7560    global $bp;
    76    
    77     if ( !$bp ) {
    78         bp_core_setup_globals();
    79         messages_setup_globals();
    80     }
    81    
     61
    8262    if ( !isset($_POST['thread_ids']) ) {
    8363        echo "-1|" . __('There was a problem deleting messages.', 'buddypress');

  • trunk/bp-wire/bp-wire-templatetags.php

    r391 r431  
    213213   
    214214    if ( $bp['current_component'] == 'wire' || $bp['current_component'] == 'profile' ) {
    215         echo $bp['current_domain'] . $bp['wire']['slug'] . '/post/';
     215        echo site_url() . '/' . $bp['wire']['slug'] . '/post/';
    216216    } else {
    217         echo $bp['current_domain'] . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/post/';
     217        echo site_url() . '/' . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/post/';
    218218    }
    219219}
Note: See TracChangeset for help on using the changeset viewer.