Changeset 375

Timestamp:

10/09/2008 04:37:49 AM (16 years ago)

Author:

apeatling

Message:

• Moved all group pages to the root, rather than using a member URL
• Introduced groupmeta support - groups_update_groupmeta / groups_delete_groupmeta / groups_get_groupmeta
• Added widgets for site wide activity and who's online
• Updated home theme to support display of new BuddyPress widgets
• Added site wide activity feed support
• Fixed bug where ajax functions would only work when logged in
• Various other bug fixes

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (6 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-activity/bp-activity-widgets.php (added)
• bp-blogs.php (modified) (1 diff)
• bp-blogs/bp-blogs-widgets.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-ajax-handler.php (added)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (2 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (5 diffs)
• bp-core/bp-core-widgets.php (modified) (3 diffs)
• bp-friends.php (modified) (1 diff)
• bp-friends/bp-friends-ajax.php (modified) (2 diffs)
• bp-groups.php (modified) (28 diffs)
• bp-groups/bp-groups-ajax.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (5 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (9 diffs)
• bp-groups/bp-groups-widgets.php (modified) (3 diffs)
• bp-groups/js/widget-groups.js (added)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -3 +3 @@
 
 define ( 'BP_ACTIVITY_IS_INSTALLED', 1 );
-define ( 'BP_ACTIVITY_VERSION', '0.1.8' );
-
-/* Use english formatted times - e.g. 6 hours / 8 hours / 1 day / 15 minutes */
-define ( 'BP_ACTIVITY_CACHE_LENGTH', '6 hours' );
+define ( 'BP_ACTIVITY_VERSION', '0.1.9' );
+
+/* How long before activity items in streams are re-cached? */
+define ( 'BP_ACTIVITY_CACHE_LENGTH', '6 HOURS' );
 
 include_once( 'bp-activity/bp-activity-classes.php' );
+include_once( 'bp-activity/bp-activity-templatetags.php' );
+include_once( 'bp-activity/bp-activity-widgets.php' );
 //include_once( 'bp-activity/bp-activity-ajax.php' );
 //include_once( 'bp-activity/bp-activity-cssjs.php' );
-/*include_once( 'bp-messages/bp-activity-admin.php' );*/
-include_once( 'bp-activity/bp-activity-templatetags.php' );
-
+//include_once( 'bp-activity/bp-activity-admin.php' );
 
 /**************************************************************************
@@ -64 +64 @@
                 KEY component_name (component_name)
                );";
+
+    $sql[] = "CREATE TABLE ". $bp['activity']['table_name_sitewide'] ." (
+                id int(11) NOT NULL AUTO_INCREMENT,
+                user_id int(11) NOT NULL,
+                content longtext NOT NULL,
+                component_name varchar(75) NOT NULL,
+                date_cached datetime NOT NULL,
+                date_recorded datetime NOT NULL,
+                PRIMARY KEY id (id),
+                KEY date_cached (date_cached),
+                KEY date_recorded (date_recorded),
+                KEY user_id (user_id),
+                KEY component_name (component_name)
+               );";
     
     require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
@@ -89 +103 @@
         
         'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_friends_activity_cached',
+        'table_name_sitewide' => $wpdb->base_prefix . 'bp_activity_sitewide',
         
         'image_base' => site_url() . '/wp-content/mu-plugins/bp-activity/images',

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

@@ -67 +67 @@
             $activity_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name_cached . " ( content, component_name, date_cached, date_recorded, is_private ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d )", $activity_content, $this->component_name, time(), $this->date_recorded, $this->is_private ) );
         
+            // Add the cached version of the activity to the cached activity table.
+            $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, component_name, date_cached, date_recorded ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $bp['loggedin_userid'], $activity_content, $this->component_name, time(), $this->date_recorded ) );
+            
             if ( $activity && $activity_cached )
                 return true;
@@ -104 +107 @@
         $last_cached = get_usermeta( $bp['current_userid'], 'bp_activity_last_cached' );
         
-        if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) >= time() ) {
+        if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) <= time() ) {
             
             //echo '<small style="color: green">** Debug: Using Cache **</small>';
@@ -140 +143 @@
                     unset($activities_formatted[$i]);
             }
-            
+        
             if ( count($activities_formatted) )
-                BP_Activity_Activity::cache_activities( $activities_formatted );
+                BP_Activity_Activity::cache_activities( $activities_formatted, $user_id );
         }
         
@@ -209 +212 @@
     }
     
+    function get_sitewide_activity( $limit = 15 ) {
+        global $wpdb, $bp;
+        
+        if ( $limit )
+            $limit_sql = $wpdb->prepare( " LIMIT %d", $limit );
+        
+        /* Remove entries that are older than 1 week */
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE DATE_ADD(date_recorded, INTERVAL 1 WEEK) <= NOW()" ) );
+        
+        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_sitewide'] . " ORDER BY date_recorded DESC $limit_sql" ) );
+        
+        for ( $i = 0; $i < count( $activities ); $i++ ) {
+            $activities_formatted[$i]['content'] = $activities[$i]->content;
+            $activities_formatted[$i]['date_recorded'] = $activities[$i]->date_recorded;
+            $activities_formatted[$i]['component_name'] = $activities[$i]->component_name;
+        }
+        
+        return $activities_formatted;
+    }
+    
     function cache_friends_activities( $activity_array ) {
         global $wpdb, $bp;
@@ -223 +246 @@
     }
     
-    function cache_activities( $activity_array ) {
+    function cache_activities( $activity_array, $user_id ) {
         global $wpdb, $bp;
         
@@ -229 +252 @@
         $wpdb->query( "TRUNCATE TABLE " . $bp['activity']['table_name_current_user_cached'] );
         
+        /* Empty user's activities from the sitewide stream */
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE user_id = %d", $user_id ) );
+        
         for ( $i = 0; $i < count($activity_array); $i++ ) {
+            if ( $activity_array[$i]['content'] == '' ) continue;
+            
             // Cache that sucka...
             $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_current_user_cached'] . " ( content, component_name, date_cached, date_recorded, is_private ) VALUES ( %s, %s, FROM_UNIXTIME(%d), %s, %d )", $activity_array[$i]['content'], $activity_array[$i]['component_name'], time(), $activity_array[$i]['date_recorded'], $activity_array[$i]['is_private'] ) );
+            
+            // Add to the sitewide activity stream
+            if ( !$activity_array[$i]['is_private'] )
+                $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, component_name, date_cached, date_recorded ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %s )", $user_id, $activity_array[$i]['content'], $activity_array[$i]['component_name'], time(), $activity_array[$i]['date_recorded'] ) );
         }
         

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

@@ -134 +134 @@
 
 function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $is_home = true ) {
-
+    if ( !$content )
+        return false;
+        
     /* Split the content so we don't evaluate and replace text on content we don't want to */
     $content = explode( '%s', $content );

trunk/bp-blogs.php

@@ -222 +222 @@
             $post = BP_Blogs_Post::fetch_post_content($post);
 
-            $content = bp_core_get_userlink($post->user_id) . ' ' . __('wrote a new blog post') . ' <a href="' . bp_post_get_permalink( $post, $post->blog_id ) . '">' . $post->post_title . '</a> <span class="time-since">%s</span>';     
+            $content = bp_core_get_userlink($post->post_author_id) . ' ' . __('wrote a new blog post') . ' <a href="' . bp_post_get_permalink( $post, $post->blog_id ) . '">' . $post->post_title . '</a> <span class="time-since">%s</span>';      
             $content .= '<blockquote>' . bp_create_excerpt($post->post_content) . '</blockquote>';
             return $content;

trunk/bp-blogs/bp-blogs-widgets.php

@@ -47 +47 @@
                             <h4 class="item-title"><a href="<?php echo bp_post_get_permalink( $post, $post->blog_id ) ?>" title="<?php echo apply_filters( 'the_title', $post->post_title ) ?>"><?php echo apply_filters( 'the_title', $post->post_title ) ?></a></h4>
                             <?php if ( !$counter ) : ?>
-                                <div class="item-content"><?php echo apply_filters( 'the_excerpt', $post->post_content ) ?></div>
+                                <div class="item-content"><?php echo bp_create_excerpt($post->post_content) ?></div>
                             <?php endif; ?>
                             <div class="item-meta"><em>by <?php echo bp_core_get_userlink($post->post_author) ?> from the blog "<a href="<?php echo get_blog_option($post->blog_id, 'siteurl') ?>"><?php echo get_blog_option($post->blog_id, 'blogname') ?></a>"</em></div>

trunk/bp-core.php

@@ -108 +108 @@
     if ( !$bp['current_component'] )
         $bp['current_component'] = $bp['default_component'];
-
 }
 add_action( 'wp', 'bp_core_setup_globals', 1 );
@@ -213 +212 @@
  */
 function bp_core_get_current_userid() {
-    global $current_blog;
-    
-    /* Get the ID of the current blog being viewed. */
-    $blog_id = $current_blog->blog_id;
-    
+    global $current_blog, $current_user;
+    
+    if ( $current_blog->blog_id == 1 )
+        return $current_user->ID;
+        
     /* Check to see if this is a user home, and if it is, get the user id */
-    if ( !$current_userid = bp_core_get_homebase_userid( $blog_id ) )
+    if ( !$current_userid = bp_core_get_homebase_userid( $current_blog->blog_id ) )
         return false; // return false if this is a normal blog, and not a user home.
     

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

@@ -110 +110 @@
     $pages = $bp_path;
     
-    if ( $wpdb->blogid == $bp['current_homebase_id'] ) {
-        if ( !file_exists( TEMPLATEPATH . "/header.php" ) || !file_exists( TEMPLATEPATH . "/footer.php" ) )
-            wp_die( 'Please make sure your BuddyPress enabled theme includes a header.php and footer.php file.');
+    if ( !file_exists( TEMPLATEPATH . "/header.php" ) || !file_exists( TEMPLATEPATH . "/footer.php" ) )
+        wp_die( 'Please make sure your BuddyPress enabled theme includes a header.php and footer.php file.');
 
-        do_action( 'get_header' );
-        load_template( TEMPLATEPATH . "/header.php" );
-    
-        if ( is_array( $pages ) ) {
-            foreach( $pages as $page ) {
-                if ( file_exists( TEMPLATEPATH . "/" . $page . ".php" ) ) {
-                    load_template( TEMPLATEPATH . "/" . $page . ".php" );
-                }
-            }
-        } else {
-            if ( file_exists( TEMPLATEPATH . "/" . $pages . ".php" ) ) {
-                load_template( TEMPLATEPATH . "/" . $pages . ".php" );
-            } else {
-                load_template( TEMPLATEPATH . "/index.php" );
+    do_action( 'get_header' );
+    load_template( TEMPLATEPATH . "/header.php" );
+
+    if ( is_array( $pages ) ) {
+        foreach( $pages as $page ) {
+            if ( file_exists( TEMPLATEPATH . "/" . $page . ".php" ) ) {
+                load_template( TEMPLATEPATH . "/" . $page . ".php" );
             }
         }
-    
-        do_action( 'get_footer' );
-        load_template( TEMPLATEPATH . "/footer.php" );
-        die;
+    } else {
+        if ( file_exists( TEMPLATEPATH . "/" . $pages . ".php" ) ) {
+            load_template( TEMPLATEPATH . "/" . $pages . ".php" );
+        } else {
+            if ( file_exists( TEMPLATEPATH . "/home.php" ) )
+                load_template( TEMPLATEPATH . "/home.php" );
+            else
+                load_template( TEMPLATEPATH . "/index.php" );   
+        }
     }
+
+    do_action( 'get_footer' );
+    load_template( TEMPLATEPATH . "/footer.php" );
+    die;
 }
 ?>

trunk/bp-core/bp-core-classes.php

@@ -94 +94 @@
             $limit = 5;
             
-        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' ORDER BY meta_value ASC LIMIT %d", $limit ) );
+        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' ORDER BY meta_value DESC LIMIT %d", $limit ) );
     }
 
@@ -107 +107 @@
 
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'total_friend_count' ORDER BY meta_value DESC LIMIT %d", $limit ) );
+    }
+    
+    function get_online_users( $limit = 5 ) {
+        global $wpdb;
         
+        if ( !$limit )
+            $limit = 5;
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' AND DATE_ADD( FROM_UNIXTIME(meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY meta_value DESC LIMIT %d", $limit ) );      
     }
-
 }
 

trunk/bp-core/bp-core-cssjs.php

@@ -25 +25 @@
  */
 function bp_core_add_ajax_js() {
-    echo '<script type="text/javascript">var ajaxurl = "' . site_url() . '/wp-admin/admin-ajax.php";</script>';
+    echo '<script type="text/javascript">var ajaxurl = "' . site_url() . '/wp-content/mu-plugins/bp-core/bp-core-ajax-handler.php";</script>';
 }
 add_action( 'wp_head', 'bp_core_add_ajax_js' );

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

@@ -22 +22 @@
  */
 function bp_get_nav() {
-    global $bp;
+    global $bp, $current_blog;
     
     /* Sort the nav by key as the array has been put together in different locations */
@@ -30 +30 @@
     foreach( (array) $bp['bp_nav'] as $nav_item ) {
         /* If the current component matches the nav item id, then add a highlight CSS class. */
-        if ( $bp['current_component'] == $nav_item['css_id'] && $bp['current_userid'] == $bp['loggedin_userid'] ) {
+        if ( $bp['current_component'] == $nav_item['css_id'] && bp_is_home() ) {
             $selected = ' class="current"';
         } else {
@@ -39 +39 @@
            then check to see if the two users are friends. if they are, add a highligh CSS class
            to the friends nav item if it exists. */
-        if ( $bp['current_userid'] != $bp['loggedin_userid'] ) {
+        if ( !bp_is_home() ) {
             if ( function_exists('friends_check_friendship') ) {
                 if ( friends_check_friendship( $bp['current_userid'] ) == 'is_friend' && $nav_item['css_id'] == $bp['friends']['slug'] ) {
@@ -54 +54 @@
     
     /* Always add a log out list item to the end of the navigation */
-    echo '<li><a id="wp-logout" href="' . get_option('home') . '/wp-login.php?action=logout">Log Out</a><li>';
+    echo '<li><a id="wp-logout" href="' . site_url() . '/wp-login.php?action=logout">Log Out</a><li>';
 }
 
@@ -301 +301 @@
 }
 
+function bp_loggedinuser_link() {
+    global $bp;
+    echo bp_core_get_userlink( $bp['loggedin_userid'] );
+}
+
 /* Template functions for fetching globals, without querying the DB again
    also means we dont have to use the $bp variable in the template (looks messy) */

trunk/bp-core/bp-core-widgets.php

@@ -19 +19 @@
         if ( is_active_widget( 'bp_core_widget_members' ) )
             wp_enqueue_script( 'bp_core_widget_members-js', site_url() . '/wp-content/mu-plugins/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );     
-    }
+    } else {
+        
+        /* Widgets we specifically only want on member home bases, or blogs and not the main home blog */
+
+    }
+    
+    /* Widgets that can be enabled anywhere */
+    register_sidebar_widget( __('Who\'s Online'), 'bp_core_widget_whos_online');
+    register_widget_control( __('Who\'s Online'), 'bp_core_widget_whos_online_control' );   
+
 }
 add_action( 'plugins_loaded', 'bp_core_register_widgets' );
@@ -91 +100 @@
     <?php if ( $users ) : ?>
         <div class="item-options" id="members-list-options">
-            <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" />
+            <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
             <a href="<?php echo site_url() . '/members' ?>" id="newest-members" class="selected"><?php _e("Newest") ?></a> | 
             <a href="<?php echo site_url() . '/members' ?>" id="recently-active-members"><?php _e("Active") ?></a> | 
@@ -150 +159 @@
 <?php
 }
+
+/*** WHO'S ONLINE WIDGET *****************/
+
+function bp_core_widget_whos_online($args) {
+    global $current_blog;
+    
+    extract($args);
+    $options = get_blog_option( $current_blog->blog_id, 'bp_core_widget_whos_online' );
+?>
+    <?php echo $before_widget; ?>
+    <?php echo $before_title
+        . $widget_name
+        . $after_title; ?>
+
+    <?php $users = BP_Core_User::get_online_users($options['max_members']) ?>
+
+    <?php if ( $users ) : ?>
+            <div class="avatar-block">
+            <?php foreach ( (array) $users as $user ) : ?>
+                <?php if ( !bp_core_user_has_home($user->user_id) || !$user->user_id ) continue; ?>
+                <div class="item-avatar">
+                    <a href="<?php echo bp_core_get_userurl($user->user_id) ?>" title="<?php bp_fetch_user_fullname( $user->user_id, true ) ?>"><?php echo bp_core_get_avatar( $user->user_id, 1 ) ?></a>
+                </div>
+            <?php endforeach; ?>
+            </div>
+        </ul>
+
+        <?php 
+        if ( function_exists('wp_nonce_field') )
+            wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members' );
+        ?>
+
+        <input type="hidden" name="bp_core_widget_members_max" id="bp_core_widget_members_max" value="<?php echo $options['max_members'] ?>" />
+
+    <?php else: ?>
+        <div class="widget-error">
+            <?php _e('There are no users currently online.') ?>
+        </div>
+    <?php endif; ?>
+
+    <?php echo $after_widget; ?>
+<?php
+}
+
+function bp_core_widget_whos_online_control() {
+    global $current_blog;
+    
+    $options = $newoptions = get_blog_option( $current_blog->blog_id, 'bp_core_widget_whos_online' );
+
+    if ( $_POST['bp-widget-whos-online-submit'] ) {
+        $newoptions['max_members'] = strip_tags( stripslashes( $_POST['bp-widget-whos-online-max-members'] ) );
+    }
+    
+    if ( $options != $newoptions ) {
+        $options = $newoptions;
+        update_blog_option( $current_blog->blog_id, 'bp_core_widget_whos_online', $options );
+    }
+    
+    $max_members = attribute_escape( $options['max_members'] );
+?>
+        <p><label for="bp-widget-whos-online-max-members"><?php _e('Maximum number of members to show:'); ?><br /><input class="widefat" id="bp-widget-whos-online-max-members" name="bp-widget-whos-online-max-members" type="text" value="<?php echo $max_members; ?>" style="width: 30%" /></label></p>
+        <input type="hidden" id="bp-widget-whos-online-submit" name="bp-widget-whos-online-submit" value="1" />
+<?php
+}

trunk/bp-friends.php

@@ -194 +194 @@
             $friendship = new BP_Friends_Friendship( $friendship_id, false, false );
 
-            if ( !$friendship )
+            if ( !$friendship->initiator_user_id || !$friendship->friend_user_id )
                 return false;
             

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

@@ -134 +134 @@
     if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'is_friend' ) {
         if ( !friends_remove_friend( $bp['loggedin_userid'], $bp['current_userid'] ) ) {
-            echo "-1[[SPLIT]]" . __("Friendship could not be canceled.");
+            echo __("Friendship could not be canceled.");
         } else {
             friends_update_friend_totals( $bp['loggedin_userid'], $bp['current_userid'], 'remove' );
@@ -141 +141 @@
     } else if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'not_friends' ) {
         if ( !friends_add_friend( $bp['loggedin_userid'], $_POST['fid'] ) ) {
-            echo "-1[[SPLIT]]" . __("Friend could not be added.");
+            echo __("Friendship could not be requested.");
         } else {
             echo __('Friendship Requested');

trunk/bp-groups.php

@@ -3 +3 @@
 
 define ( 'BP_GROUPS_IS_INSTALLED', 1 );
-define ( 'BP_GROUPS_VERSION', '0.1.6' );
+define ( 'BP_GROUPS_VERSION', '0.1.9' );
 
 include_once( 'bp-groups/bp-groups-classes.php' );
@@ -58 +58 @@
             KEY is_confirmed (is_confirmed)
            );";
+
+    $sql[] = "CREATE TABLE ". $bp['groups']['table_name_groupmeta'] ." (
+            id int(11) NOT NULL AUTO_INCREMENT,
+            group_id int(11) NOT NULL,
+            meta_key varchar(255) DEFAULT NULL,
+            meta_value longtext DEFAULT NULL,
+            PRIMARY KEY (id),
+            KEY group_id (group_id),
+            KEY meta_key (meta_key)
+           );";
     
     if ( function_exists('bp_wire_install') ) {
@@ -86 +96 @@
  **************************************************************************/
 
-function groups_setup_globals() {
-    global $bp, $wpdb;
-
+function groups_setup_globals( $global = true ) {
+    global $wpdb;
+    
+    if ( $global )
+        global $bp;
+    
     $bp['groups'] = array(
         'table_name' => $wpdb->base_prefix . 'bp_groups',
         'table_name_members' => $wpdb->base_prefix . 'bp_groups_members',
+        'table_name_groupmeta' => $wpdb->base_prefix . 'bp_groups_groupmeta',
         'image_base' => site_url() . '/wp-content/mu-plugins/bp-groups/images',
         'format_activity_function' => 'groups_format_activity',
@@ -101 +115 @@
     
     $bp['groups']['forbidden_names'] = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add' );
+
+    return $bp;
 }
 add_action( 'wp', 'groups_setup_globals', 1 );  
@@ -124 +140 @@
     if ( ( $wpdb->get_var("show tables like '%" . $bp['groups']['table_name'] . "%'") == false ) || ( get_site_option('bp-groups-version') < BP_GROUPS_VERSION )  )
         groups_install(BP_GROUPS_VERSION);
-        
+    
 }
 add_action( 'admin_menu', 'groups_add_admin_menu' );
@@ -135 +151 @@
 
 function groups_setup_nav() {
-    global $bp;
+    global $bp, $current_blog;
     global $group_obj, $is_single_group;
     
@@ -151 +167 @@
     bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_my_groups', 'my-groups' );
         
-    $groups_link = $group_link = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/';
+    $groups_link = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/';
     
     /* Add the subnav items to the groups nav item */
@@ -170 +186 @@
             $bp['bp_options_title'] = $bp['current_fullname'];
             
-        } else if ( $is_single_group ) {
+        } else if ( $is_single_group ) {        
             // We are viewing a single group, so set up the
             // group navigation menu using the $group_obj global.
@@ -183 +199 @@
             $bp['bp_options_avatar'] = '<img src="' . $group_obj->avatar_thumb . '" alt="Group Avatar Thumbnail" />';
             
-            $group_link = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $group_obj->slug . '/';
+            switch_to_blog(1);
+            $group_link = site_url() . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug . '/';
+            switch_to_blog($current_blog->blog_id);
             
             // Reset the existing subnav items
@@ -202 +220 @@
             
             bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members'), $group_link, 'groups_screen_group_members', 'group-members' );
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites'), $group_link, 'groups_screen_group_invite', 'group-invite' );
             
             if ( is_user_logged_in() && groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites'), $group_link, 'groups_screen_group_invite', 'group-invite' );
                 bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group'), $group_link, 'groups_screen_group_leave', 'group-leave' );
             }
@@ -211 +229 @@
 }
 add_action( 'wp', 'groups_setup_nav', 2 );
+
+function groups_get_group_theme() {
+    global $current_component, $current_action, $is_single_group;
+    
+    // The theme filter does not recognize any globals, where as the stylesheet filter does.
+    // We have to set up the globals to use manually.
+    bp_core_set_uri_globals();
+    $groups_bp = groups_setup_globals(false);
+    
+    if ( $current_component == $groups_bp['groups']['slug'] )
+        $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp['groups']['table_name'] );
+
+    if ( $current_component == $groups_bp['groups']['slug'] && $is_single_group )
+        $theme = 'buddypress';
+    else
+        $theme = get_option('template');
+    
+    return $theme;
+}
+add_filter( 'template', 'groups_get_group_theme' );
+
+function groups_get_group_stylesheet() {
+    global $bp, $is_single_group;
+    
+    if ( $bp['current_component'] == $bp['groups']['slug'] && $is_single_group )    
+        return 'buddypress';
+    else
+        return get_option('stylesheet');    
+}
+add_filter( 'stylesheet', 'groups_get_group_stylesheet' );
+
 
 /***** Screens **********/
@@ -334 +383 @@
                 }
             }
-        
+    
         } else if ( $bp['action_variables'][1] == 'delete' && BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
-                                            
-            if ( !groups_delete_wire_post( $bp['action_variables'][2], $bp['groups']['table_name_wire'] ) ) {
+            $wire_message_id = $bp['action_variables'][2];
+                                
+            if ( !groups_delete_wire_post( $wire_message_id, $bp['groups']['table_name_wire'] ) ) {
                 bp_catch_uri( 'groups/group-home' );
             } else {
@@ -412 +462 @@
             } else {
                 $bp['message'] = __('You left the group successfully.');
-                $bp['message_type'] = 'success';                                    
+                $bp['message_type'] = 'success';    
             }
             add_action( 'template_notices', 'bp_core_render_notice' );
         
-            $is_single_group = false;
-            $bp['current_action'] = 'group-finder';
-            bp_catch_uri( 'groups/group-finder' );
+            $bp['current_action'] = 'group-home';
+            bp_catch_uri( 'groups/group-home' );
         
         } else if ( isset($bp['action_variables']) && $bp['action_variables'][1] == 'no' ) {
@@ -445 +494 @@
         } else {
             $bp['message'] = __('You joined the group!');
-            $bp['message_type'] = 'success';                        
+            $bp['message_type'] = 'success';    
         }
 
@@ -469 +518 @@
     } 
 }
-add_action( 'bp_groups_joined_group', 'groups_record_activity' );
-add_action( 'bp_groups_created_group', 'groups_record_activity' );
-add_action( 'bp_groups_new_wire_post', 'groups_record_activity' );
+add_action( 'activity_groups_joined_group', 'groups_record_activity' );
+add_action( 'activity_groups_created_group', 'groups_record_activity' );
+add_action( 'activity_groups_new_wire_post', 'groups_record_activity' );
 
 /**************************************************************************
@@ -518 +567 @@
 
 /**************************************************************************
- groups_admin_setup()
+ groups_update_last_activity()
  
- Setup CSS, JS and other things needed for the xprofile component.
-**************************************************************************/
-
-function groups_admin_setup() {
-}
-add_action( 'admin_menu', 'groups_admin_setup' );
-
+ Sets groupmeta for the group with the last activity date for the group based
+ on specific group activities.
+ **************************************************************************/
+
+function groups_update_last_activity( $args = true ) {
+    extract($args);
+
+    groups_update_groupmeta( $group_id, 'last_activity', time() );
+}
+add_action( 'groups_deleted_wire_post', 'groups_update_last_activity' );
+add_action( 'groups_new_wire_post', 'groups_update_last_activity' );
+add_action( 'groups_joined_group', 'groups_update_last_activity' );
+add_action( 'groups_leave_group', 'groups_update_last_activity' );
+add_action( 'groups_created_group', 'groups_update_last_activity' );
+
+
+/**************************************************************************
+ groups_get_user_groups()
+ 
+ Fetch the groups the current user is a member of.
+ **************************************************************************/
 
 function groups_get_user_groups( $pag_page, $pag_num ) {
@@ -655 +718 @@
                     if ( !$group->save() )
                         return false;
-                    
+                                        
                     // Save the creator as the group administrator
                     $admin = new BP_Groups_Member( $bp['loggedin_userid'], $group->id );
@@ -663 +726 @@
                     $admin->inviter_id = 0;
                     $admin->is_confirmed = 1;
-                                    
+
                     if ( !$admin->save() )
                         return false;
-                        
+                    
+                    /* Set groupmeta */
+                    groups_update_groupmeta( $group->id, 'total_member_count', 1 );
+                    groups_update_groupmeta( $group->id, 'theme', 'buddypress' );
+                    groups_update_groupmeta( $group->id, 'stylesheet', 'buddypress' );
+                    
                     return $group->id;
                 }
@@ -680 +748 @@
                 $group->enable_photos = 1;
                 $group->photos_admin_only = 0;
-                $group->date_created = time();
                 
                 if ( !isset($_POST['group-show-wire']) )
@@ -727 +794 @@
                 groups_send_invites($group);
                 
-                do_action( 'bp_groups_created_group', array( 'item_id' => $group->id, 'component_name' => 'groups', 'component_action' => 'created_group', 'is_private' => 0 ) );
+                /* activity stream recording action */
+                do_action( 'activity_groups_created_group', array( 'item_id' => $group->id, 'component_name' => 'groups', 'component_action' => 'created_group', 'is_private' => 0 ) );
+                
+                /* regular action */
+                do_action( 'groups_created_group', array( 'group_id' => $group->id ) );
                 
                 header( "Location: " . $bp['loggedin_domain'] . $bp['groups']['slug'] . "/" . $group->slug );
@@ -774 +845 @@
         return false;
     
+    do_action( 'groups_invite_user', array( 'group_id' => $group_id, 'user_id' => $user_id ) );
+        
     return true;
 }
@@ -782 +855 @@
     if ( !BP_Groups_Member::delete( $user_id, $group_id ) )
         return false;
-    
+
+    do_action( 'groups_uninvite_user', array( 'group_id' => $group_id, 'user_id' => $user_id ) );
+
     return true;
 }
@@ -824 +899 @@
         wp_mail( $invited_user->email, __("New Group Invitation:") . $group_obj->name, $message, "From: noreply@" . $_SERVER[ 'HTTP_HOST' ]  );
     }
+
+    do_action( 'groups_send_invites', array( 'group_id' => $group_obj->id, 'invited_users' => $invited_users ) );
 }
 
@@ -832 +909 @@
     if ( !groups_uninvite_user( $bp['loggedin_userid'], $group_id ) )
         return false;
+
+    do_action( 'groups_leave_group', array( 'group_id' => $group_id, 'user_id' => $bp['loggedin_userid'] ) );
+
+    /* Modify group member count */
+    groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 );
     
     return true;
@@ -850 +932 @@
     if ( !$new_member->save() )
         return false;
-    
-    do_action( 'bp_groups_joined_group', array( 'item_id' => $new_member->group_id, 'component_name' => 'groups', 'component_action' => 'joined_group', 'is_private' => 0 ) );
+
+    /* activity stream recording action */
+    do_action( 'activity_groups_joined_group', array( 'item_id' => $new_member->group_id, 'component_name' => 'groups', 'component_action' => 'joined_group', 'is_private' => 0 ) );
+    
+    /* regular action */
+    do_action( 'groups_joined_group', array( 'group_id' => $group_id, 'user_id' => $bp['loggedin_userid'] ) );
+    
+    /* Modify group member count */
+    groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
     
     return true;
@@ -858 +947 @@
 function groups_new_wire_post( $group_id, $content ) {
     if ( $wire_post_id = bp_wire_new_post( $group_id, $content ) ) {
-        do_action( 'bp_groups_new_wire_post', array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post', 'is_private' => 0 ) );
+        
+        /* activity stream recording action */
+        do_action( 'activity_groups_new_wire_post', array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post', 'is_private' => 0 ) );
+        
+        /* regular action */
+        do_action( 'groups_new_wire_post', array( 'group_id' => $group_id, 'wire_post_id' => $wire_post_id ) );
+        
         return true;
     }
@@ -867 +962 @@
 function groups_delete_wire_post( $wire_post_id, $table_name ) {
     if ( bp_wire_delete_post( $wire_post_id, $table_name ) ) {
-        do_action( 'bp_groups_deleted_wire_post', array( 'wire_post_id' => $wire_post_id ) );
+        do_action( 'groups_deleted_wire_post', array( 'wire_post_id' => $wire_post_id ) );
         return true;
     }
@@ -873 +968 @@
     return false;
 }
+
+function groups_get_newest( $limit = 5 ) {
+    return BP_Groups_Group::get_newest($limit);
+}
+
+function groups_get_active( $limit = 5 ) {
+    return BP_Groups_Group::get_active($limit);
+}
+
+function groups_get_popular( $limit = 5 ) {
+    return BP_Groups_Group::get_popular($limit);
+}
+
+
+//
+// Group meta functions
+//
+
+function groups_delete_groupmeta( $group_id, $meta_key, $meta_value = '' ) {
+    global $wpdb, $bp;
+    
+    if ( !is_numeric( $group_id ) )
+        return false;
+        
+    $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+
+    if ( is_array($meta_value) || is_object($meta_value) )
+        $meta_value = serialize($meta_value);
+        
+    $meta_value = trim( $meta_value );
+
+    if ( !empty($meta_value) )
+        $wpdb->query( $wpdb->prepare("DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE groups_id = %d AND meta_key = %s AND meta_value = %s", $group_id, $meta_key, $meta_value) );
+    else
+        $wpdb->query( $wpdb->prepare("DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key) );
+
+    // TODO need to look into using this.
+    // wp_cache_delete($group_id, 'groups');
+
+    return true;
+}
+
+function groups_get_groupmeta( $group_id, $meta_key = '') {
+    global $wpdb, $bp;
+    
+    $group_id = (int) $group_id;
+
+    if ( !$group_id )
+        return false;
+
+    if ( !empty($meta_key) ) {
+        $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+        
+        // TODO need to look into using this.
+        //$user = wp_cache_get($user_id, 'users');
+        
+        // Check the cached user object
+        //if ( false !== $user && isset($user->$meta_key) )
+        //  $metas = array($user->$meta_key);
+        //else
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key) );
+    } else {
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d", $group_id) );
+    }
+
+    if ( empty($metas) ) {
+        if ( empty($meta_key) )
+            return array();
+        else
+            return '';
+    }
+
+    $metas = array_map('maybe_unserialize', $metas);
+
+    if ( count($metas) == 1 )
+        return $metas[0];
+    else
+        return $metas;
+}
+
+function groups_update_groupmeta( $group_id, $meta_key, $meta_value ) {
+    global $wpdb, $bp;
+    
+    if ( !is_numeric( $group_id ) )
+        return false;
+    
+    $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
+
+    if ( is_string($meta_value) )
+        $meta_value = stripslashes($wpdb->escape($meta_value));
+        
+    $meta_value = maybe_serialize($meta_value);
+
+    if (empty($meta_value)) {
+        return groups_delete_groupmeta( $group_id, $meta_key );
+    }
+
+    $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
+    
+    if ( !$cur ) {
+        $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['groups']['table_name_groupmeta'] . " ( group_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $group_id, $meta_key, $meta_value ) );
+    } else if ( $cur->meta_value != $meta_value ) {
+        $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['groups']['table_name_groupmeta'] . " SET meta_value = %s WHERE group_id = %d AND meta_key = %s", $meta_value, $group_id, $meta_key ) );
+    } else {
+        return false;
+    }
+
+    // TODO need to look into using this.
+    // wp_cache_delete($user_id, 'users');
+
+    return true;
+}
+
 
 function groups_remove_data( $user_id ) {

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

@@ -94 +94 @@
                 <img class="avatar" alt="Group Avatar" src="<?php echo $group->avatar_thumb ?>"/>
                 <h4>
-                    <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><?php echo $group->name ?></a>
-                    <span class="small"> - <?php echo count($group->user_dataset) ?> members</span>
+                    <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
+                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members') ?></span>
                 </h4>
                 <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
@@ -150 +150 @@
                 <img class="avatar" alt="Group Avatar" src="<?php echo $group->avatar_thumb ?>"/>
                 <h4>
-                    <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><?php echo $group->name ?></a>
-                    <span class="small"> - <?php echo count($group->user_dataset) ?> members</span>
+                    <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
+                    <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members') ?></span>
                 </h4>
                 <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
@@ -164 +164 @@
 }
 add_action( 'wp_ajax_group_finder_search', 'groups_ajax_group_finder_search' );
+
+
+function groups_ajax_widget_groups_list() {
+    global $bp;
+
+    check_ajax_referer('groups_widget_groups_list');
+
+    if ( !$bp ) {
+        bp_core_setup_globals();
+        groups_setup_globals();
+    }
+    
+    switch ( $_POST['filter'] ) {
+        case 'newest-groups':
+            $groups = groups_get_newest($_POST['max-groups']);
+        break;
+        case 'recently-active-groups':
+            $groups = groups_get_active($_POST['max-groups']);
+        break;
+        case 'popular-groups':
+            $groups = groups_get_popular($_POST['max-groups']);
+        break;
+    }
+
+    if ( $groups ) {
+        echo '0[[SPLIT]]'; // return valid result.
+    
+        foreach ( (array) $groups as $group ) {
+            $group = new BP_Groups_Group( $group->group_id, false );
+        ?>
+            <li>
+                <div class="item-avatar">
+                    <img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" />
+                </div>
+
+                <div class="item">
+                    <div class="item-title"><a href="<?php echo bp_group_permalink( $group, true ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
+                    <div class="item-meta">
+                        <span class="activity">
+                            <?php 
+                            if ( $_POST['filter'] == 'newest-groups') {
+                                echo bp_core_get_last_activity( $group->date_created, __('created '), __(' ago') );
+                            } else if ( $_POST['filter'] == 'recently-active-groups') {
+                                echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __('active '), __(' ago') );
+                            } else if ( $_POST['filter'] == 'popular-groups') {
+                                if ( $group->total_member_count == 1 )
+                                    echo $group->total_member_count . __(' member');
+                                else
+                                    echo $group->total_member_count . __(' members');
+                            }
+                            ?>
+                        </span>
+                    </div>  
+                </div>
+            </li>
+            <?php   
+        }
+    } else {
+        echo "-1[[SPLIT]]<li>" . __("No groups matched the current filter.");
+    }
+}
+add_action( 'wp_ajax_widget_groups_list', 'groups_ajax_widget_groups_list' );
+
 ?>

trunk/bp-groups/bp-groups-classes.php

@@ -56 +56 @@
             $this->enable_photos = $group->enable_photos;
             $this->photos_admin_only = $group->photos_admin_only;
-            $this->date_created = $group->date_created;
+            $this->date_created = strtotime($group->date_created);
+            $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
             
             if ( !$group->avatar_thumb )
@@ -70 +71 @@
             if ( $get_user_dataset ) {
                 $this->user_dataset = $this->get_user_dataset();
-                $this->total_member_count = count( $this->user_dataset );
+                
+                if ( !$this->total_member_count ) {
+                    $this->total_member_count = count( $this->user_dataset );
+                    groups_update_groupmeta( $this->id, 'total_member_count', $this->total_member_count );
+                }
             }
         }   
@@ -159 +164 @@
             );
         }
-
+        
         $result = $wpdb->query($sql);
         
@@ -221 +226 @@
             return false;
         
+        /* Remove groupmeta */
+        groups_delete_groupmeta( $group_id );
+        
         return true;
     }
     
-    function group_exists( $slug ) {
-        global $wpdb, $bp;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM " . $bp['groups']['table_name'] . " WHERE slug = %s", $slug ) );
+    function group_exists( $slug, $table_name = false ) {
+        global $wpdb, $bp;
+        
+        if ( !$table_name )
+            $table_name = $bp['groups']['table_name'];
+            
+        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $table_name WHERE slug = %s", $slug ) );
     }
 
@@ -313 +325 @@
             $limit = 5;
 
-        return $wpdb->get_results( $wpdb->prepare( "SELECT id FROM " . $bp['groups']['table_name'] . " ORDER BY date_created DESC LIMIT %d", $limit ) ); 
+        return $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM " . $bp['groups']['table_name'] . " ORDER BY date_created DESC LIMIT %d", $limit ) ); 
+    }
+    
+    function get_active( $limit = 5 ) {
+        global $wpdb, $bp;
+        
+        if ( !$limit )
+            $limit = 5;
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'last_activity' ORDER BY meta_value DESC LIMIT %d", $limit ) ); 
+    }
+    
+    function get_popular( $limit = 5 ) {
+        global $wpdb, $bp;
+        
+        if ( !$limit )
+            $limit = 5;
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'total_member_count' ORDER BY meta_value DESC LIMIT %d", $limit ) ); 
     }
 }

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

@@ -147 +147 @@
     global $groups_template;
     
-    ?><img src="<?php echo $groups_template->group->avatar_full ?>" class="avatar" alt="Group Avatar" /><?php
+    ?><img src="<?php echo $groups_template->group->avatar_full ?>" class="avatar" alt="<?php echo $groups_template->group->name ?> Avatar" /><?php
 }
 
@@ -153 +153 @@
     global $groups_template;
     
-    ?><img src="<?php echo $groups_template->group->avatar_thumb ?>" class="avatar" alt="Group Avatar" /><?php
-}
-
-
-function bp_group_permalink() {
-    global $groups_template, $bp;
-    echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug;
+    ?><img src="<?php echo $groups_template->group->avatar_thumb ?>" class="avatar" alt="<?php echo $groups_template->group->name ?> Avatar" /><?php
+}
+
+
+function bp_group_permalink( $group_obj = false, $echo = true ) {
+    global $groups_template, $bp, $current_blog;
+
+    if ( !$group_obj )
+        $group_obj = $groups_template->group;
+    
+    switch_to_blog(1);
+    
+    if ( $echo )
+        echo site_url() . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug;
+    else
+        return site_url() . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug;
+        
+    switch_to_blog($current_blog->blog_id);
 }
 
@@ -244 +255 @@
 function bp_group_all_members_permalink() {
     global $groups_template, $bp;
-    echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/members';
+    echo bp_group_permalink( false, true ) . '/members';
 }
 
@@ -268 +279 @@
 
     if ( $bp['current_action'] == 'my-groups' || !$bp['current_action'] ) {
-        $action = $bp['current_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
+        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
         $label = __('Filter Groups');
         $type = 'group';
     } else {
-        $action = $bp['current_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
+        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
         $label = __('Find a Group');
         $type = 'groupfinder';
@@ -505 +516 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/leave-group/yes'; 
+    echo bp_group_permalink( false, true ) . '/leave-group/yes';    
 }
 
@@ -511 +522 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/leave-group/no';
+    echo bp_group_permalink( false, true );
 }
 
@@ -559 +570 @@
     global $groups_template, $bp;
     
-    echo $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/send-invites/send';
+    echo bp_group_permalink( false, true ) . '/send-invites/send';
 }
 
@@ -566 +577 @@
     
     if ( is_user_logged_in() && !BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $groups_template->group->id ) ) {
-        echo '<a class="join-group" href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $groups_template->group->slug . '/join">' . __('Join Group') . '</a>';
+        echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group') . '</a>';
     }
 }
@@ -582 +593 @@
                 <?php $group = new BP_Groups_Group( $group_ids[$i], false, false ); ?>
                 <li>
-                    <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="Group Avatar" /></a>
-                    <h5><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] . '/' . $group->slug ?>"><?php echo $group->name ?></a></h5>
+                    <a href="<?php echo bp_group_permalink( $group, false ) ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="Group Avatar" /></a>
+                    <h5><a href="<?php echo bp_group_permalink( $group, false ) ?>"><?php echo $group->name ?></a></h5>
                 </li>
             <?php } ?>

trunk/bp-groups/bp-groups-widgets.php

@@ -37 +37 @@
     <?php if ( $groups ) : ?>
         <div class="item-options" id="groups-list-options">
-            <img id="ajax-loader-groups" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" />
+            <img id="ajax-loader-groups" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
             <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups" class="selected"><?php _e("Newest") ?></a> | 
             <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active") ?></a> | 
@@ -44 +44 @@
         <ul id="groups-list" class="item-list">
             <?php foreach ( $groups as $group ) : ?>
-                <?php $group = new BP_Groups_Group( $group->id, false ) ?>
+                <?php $group = new BP_Groups_Group( $group->group_id, false ) ?>
                 <li>
                     <div class="item-avatar">
@@ -51 +51 @@
 
                     <div class="item">
-                        <div class="item-title"><?php echo $group->name ?></div>
+                        <div class="item-title"><a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
                         <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( $group->date_created, __('created '), __(' ago') ) ?></span></div>
                     </div>

trunk/bp-xprofile.php

@@ -263 +263 @@
 
             if ( ( $wire_post->item_id == $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id == $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
-                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on') . ' ' . bp_your_or_their() . ' ' . __('own wire') . ': <span class="time-since">%s</span>';             
+                $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on their own wire') . ': <span class="time-since">%s</span>';                
             } else if ( ( $wire_post->item_id != $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id != $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
                 $content = bp_core_get_userlink($wire_post->user_id) . ' ' . __('wrote on ') . bp_core_get_userlink( $wire_post->item_id, false, false, true, true ) . ' wire: <span class="time-since">%s</span>';             

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -991 +991 @@
             $this->user_id = $profiledata->user_id;
             $this->field_id = $profiledata->field_id;
-            $this->value = $profiledata->value;
+            $this->value = stripslashes($profiledata->value);
             $this->last_updated = $profiledata->last_updated;
         }

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -232 +232 @@
 }
 
-function bp_loggedinuser_avatar_thumbnail() {
-    global $bp;
-    echo bp_core_get_avatar( $bp['loggedin_userid'], 1 );
+function bp_loggedinuser_avatar_thumbnail( $width = false, $height = false ) {
+    global $bp;
+    
+    if ( $width && $height )
+        echo bp_core_get_avatar( $bp['loggedin_userid'], 1, false, $width, $height );
+    else
+        echo bp_core_get_avatar( $bp['loggedin_userid'], 1 );
 }