Changeset 502

Timestamp:

11/06/2008 05:16:28 PM (18 years ago)

Author:

apeatling

Message:

Support for private groups and group membership requests.

Location:

trunk

Files:

• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (4 diffs)
• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-notifications.php (modified) (4 diffs)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-core/css/admin-bar.css (modified) (8 diffs)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (21 diffs)
• bp-groups/bp-groups-ajax.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (18 diffs)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (11 diffs)
• bp-groups/js/general.js (modified) (7 diffs)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (2 diffs)

trunk/bp-blogs.php

@@ -200 +200 @@
                         if ( !$blog )
                                 return false;
+                        
+                        if ( !$user_id )
+                                return false;
                                 
                         return sprintf( __( '%s created a new blog: %s', 'buddypress' ), bp_core_get_userlink($user_id), '<a href="' . get_blog_option( $blog->blog_id, 'siteurl' ) . '">' . get_blog_option( $blog->blog_id, 'blogname' ) . '</a>' ) . ' <span class="time-since">%s</span>';          

trunk/bp-core.php

@@ -2 +2 @@
 
 /* Define the current version number for checking if DB tables are up to date. */
-define( 'BP_CORE_VERSION', '0.2.7' );
+define( 'BP_CORE_VERSION', '0.2.8' );
 
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
@@ -74 +74 @@
         global $current_userid;
         global $action_variables;
-        
+
         /* The domain for the root of the site where the main blog resides */   
         $bp['root_domain'] = bp_core_get_root_domain();
@@ -155 +155 @@
                                 user_id int(11) NOT NULL,
                                 item_id int(11) NOT NULL,
+                                secondary_item_id int(11),
                                 component_name varchar(75) NOT NULL,
                                 component_action varchar(75) NOT NULL,
@@ -161 +162 @@
                         PRIMARY KEY id (id),
                             KEY item_id (item_id),
+                                KEY secondary_item_id (secondary_item_id),
                                 KEY user_id (user_id),
                             KEY is_new (is_new),

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

@@ -190 +190 @@
 class BP_Core_Notification {
         var $id;
+        var $item_id;
+        var $secondary_item_id = null;
         var $user_id;
         var $component_name;
@@ -207 +209 @@
                 
                 if ( $notification = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['core']['table_name_notifications'] . " WHERE id = %d", $this->id ) ) ) {
+                        $this->item_id = $notification->item_id;
+                        $this->secondary_item_id = $notification->secondary_item_id;
                         $this->user_id = $notification->user_id;
                         $this->component_name = $notification->component_name;
@@ -220 +224 @@
                 if ( $this->id ) {
                         // Update
-                        $sql = $wpdb->prepare( "UPDATE " . $bp['core']['table_name_notifications'] . " SET item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE " . $bp['core']['table_name_notifications'] . " SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
                 } else {
                         // Save
-                        $sql = $wpdb->prepare( "INSERT INTO " . $bp['core']['table_name_notifications'] . " ( item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
-                }
-
-                return $wpdb->query( $sql );
+                        $sql = $wpdb->prepare( "INSERT INTO " . $bp['core']['table_name_notifications'] . " ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+                }
+
+                if ( !$result = $wpdb->query( $sql ) )
+                        return false;
+
+                $this->id = $wpdb->insert_id;
+                return true;
         }
 
@@ -259 +267 @@
         }
         
-        function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action ) {
-                global $wpdb, $bp;
-                
-                return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['core']['table_name_notifications'] . " WHERE user_id = %d AND item_id = %d AND component_name = %s AND component_action = %s", $user_id, $item_id, $component_name, $component_action ) );
+        function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id ) {
+                global $wpdb, $bp;
+                
+                if ( $secondary_item_id )
+                        $secondary_item_sql = $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id );
+                
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['core']['table_name_notifications'] . " WHERE user_id = %d AND item_id = %d AND component_name = %s AND component_action = %s{$secondary_item_sql}", $user_id, $item_id, $component_name, $component_action ) );
         }
         

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

@@ -14 +14 @@
         wp_enqueue_script( 'bp-general-js', site_url() . '/wp-content/mu-plugins/bp-core/js/general.js' );
 }
-add_action( 'template_redirect', 'bp_core_add_js' );
+add_action( 'wp', 'bp_core_add_js' );
 
 /**

trunk/bp-core/bp-core-notifications.php

@@ -1 +1 @@
 <?php
 
-function bp_core_add_notification( $item_id, $user_id, $component_name, $component_action, $date_notified = false ) {
+function bp_core_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = false, $date_notified = false ) {
         global $bp;
         
@@ -14 +14 @@
         $notification->date_notified = $date_notified;
         $notification->is_new = 1;
-
+        
+        if ( $secondary_item_id )
+                $notification->secondary_item_id = $secondary_item_id;
+        
         if ( !$notification->save() )
                 return false;
@@ -61 +64 @@
                         
                         $item_id = ( $action_item_count == 1 ) ? $component_action_items[0]->item_id : false;
+                        $secondary_item_id = ( $action_item_count == 1 ) ? $component_action_items[0]->secondary_item_id : false;
                         
                         if ( function_exists( $component_name . '_format_notifications' ) ) {
-                                $renderable[] = call_user_func( $component_name . '_format_notifications', $component_action_name, $item_id, $action_item_count );
+                                $renderable[] = call_user_func( $component_name . '_format_notifications', $component_action_name, $item_id, $secondary_item_id, $action_item_count );
                         }
                 }
@@ -71 +75 @@
 }
 
-function bp_core_delete_notifications_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action ) {
-        return BP_Core_Notification::delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action );
+function bp_core_delete_notifications_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false ) {
+        return BP_Core_Notification::delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id );
 }
 

trunk/bp-core/bp-core-settings.php

@@ -124 +124 @@
                 <?php do_action( 'bp_notification_settings' ) ?>
                 
-                <p><input type="submit" name="submit" value="Save Changes" id="submit" class="auto" /></p>              
+                <p class="submit"><input type="submit" name="submit" value="Save Changes" id="submit" class="auto" /></p>               
                 
                 <?php wp_nonce_field('bp_settings_notifications') ?>

trunk/bp-core/css/admin-bar.css

@@ -2 +2 @@
 
 #wp-admin-bar {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        z-index: 1001;
-        height: 28px;
-        color: #fff;
-        text-align: left;
-        background:url(../images/admin_bar_back.gif) #818181 repeat-x;
+        position: absolute !important;
+        top: 0 !important;
+        left: 0 !important;
+        width: 100% !important;
+        z-index: 1001 !important;
+        height: 28px !important;
+        color: #fff !important;
+        text-align: left !important;
+        background:url(../images/admin_bar_back.gif) #818181 repeat-x !important;
 }
-        #wp-admin-bar * { z-index: 999; }
+        #wp-admin-bar * { z-index: 999 !important; }
 
         #wp-admin-bar img#admin-bar-logo {
-                position: absolute;
+                position: absolute !important;
                 top: 8px;
                 left: 10px;
@@ -37 +37 @@
 
 #wp-admin-bar ul { /* all lists */
-        margin: 0;
-        list-style: none;
-        line-height: 1;
-        cursor: pointer;
-        height: 30px;
-        padding: 0;
+        margin: 0 !important;
+        list-style: none !important;
+        line-height: 1 !important;
+        cursor: pointer !important;
+        height: 30px !important;
+        padding: 0 !important;
 }
         #wp-admin-bar ul {
-                margin-left: 80px;
+                margin-left: 80px !important;
         }
                 #wp-admin-bar ul li { /* all list items */
-                        padding: 0;
+                        padding: 0 !important;
                         /*height: 30px;*/
-                        float: left;
+                        float: left !important;
                 }
                         #wp-admin-bar ul li a {
-                                display: block;
-                                font-size: 1.1em;
+                                display: block !important;
+                                font-size: 1em !important;
+                                font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Tahoma, Verdana, Arial, sans-serif !important;
                                 text-decoration: none !important;
                                 color: #fff !important;
@@ -60 +61 @@
                         
                         #wp-admin-bar ul.main-nav li a:hover, #wp-admin-bar ul.main-nav li:hover {
-                                background: #777;
+                                background: #777 !important;
                                 color: #fff !important;
                         }
@@ -67 +68 @@
 
 #wp-admin-bar ul li ul { 
-        position: absolute;
-        width: 185px;
-        left: -999em; /* using left instead of display to hide menus because display: none isn't read by screen readers */
-        height: auto;
-        margin-left: 0;
+        position: absolute !important;
+        width: 185px !important;
+        left: -999em !important; /* using left instead of display to hide menus because display: none isn't read by screen readers */
+        height: auto !important;
+        margin-left: 0 !important;
 }
         #wp-admin-bar ul li ul li {
-                float: none;
-                margin: 0;
-                border: none;
-                border-bottom: 1px solid #f4f4f4;
+                float: none !important;
+                margin: 0 !important;
+                border: none !important;
+                border-bottom: 1px solid #f4f4f4 !important;
                 background: #f4f4f4 !important;
-                border-left: 1px solid #ccc;
-                border-right: 1px solid #ccc;
+                border-left: 1px solid #ccc !important;
+                border-right: 1px solid #ccc !important;
+                margin-bottom: -1px !important;
         } 
                 #wp-admin-bar ul li ul li.alt {
                         background: #fafafa !important;
-                        border-bottom: 1px solid #fafafa;
+                        border-bottom: 1px solid #fafafa !important;
                 }
                 
                 #wp-admin-bar ul li ul li:last-child {
-                        border-bottom: 1px solid #ccc;
-                        -moz-border-radius-bottomleft: 4px;
-                        -khtml-border-bottom-left-radius: 4px;
-                        -webkit-border-bottom-left-radius: 4px;
-                        border-bottom-left-radius: 4px;
-                        -moz-border-radius-bottomright: 4px;
-                        -khtml-border-bottom-right-radius: 4px;
-                        -webkit-border-bottom-right-radius: 4px;
-                        border-bottom-right-radius: 4px;
+                        border-bottom: 1px solid #ccc !important;
+                        -moz-border-radius-bottomleft: 4px !important;
+                        -khtml-border-bottom-left-radius: 4px !important;
+                        -webkit-border-bottom-left-radius: 4px !important;
+                        border-bottom-left-radius: 4px !important;
+                        -moz-border-radius-bottomright: 4px !important;
+                        -khtml-border-bottom-right-radius: 4px !important;
+                        -webkit-border-bottom-right-radius: 4px !important;
+                        border-bottom-right-radius: 4px !important;
                 }
                 
@@ -104 +106 @@
         
         #wp-admin-bar ul.main-nav li ul li a:hover {
-                background: #888;
+                background: #888 !important;
         }
         
         #wp-admin-bar ul li div.admin-bar-clear {
-                clear: both;
+                clear: both !important;
                 background: #eee !important;
-                border-bottom: 3px solid #eee;
+                border-bottom: 3px solid #eee !important;
         }
 
@@ -116 +118 @@
 
 #wp-admin-bar ul li ul ul { 
-        margin: -28px 0 0 183px;
+        margin: -28px 0 0 183px !important;
 }
 
 #wp-admin-bar ul li:hover ul, #wp-admin-bar ul li li:hover ul, #wp-admin-bar ul li.sfhover ul, #wp-admin-bar ul li ul li.sfhover ul { /* lists nested under hovered list items */
-        left: auto;
+        left: auto !important;
 }
 
 #wp-admin-bar ul li:hover ul ul, #wp-admin-bar li.sfhover ul li ul {
-        left: -999em;
+        left: -999em !important;
 }
 
 #wp-admin-bar ul.main-nav li ul li:hover {
-        background: #555;
+        background: #555 !important;
 }
 
 #wp-admin-bar ul li ul li ul li:first-child {
-        border-top: 1px solid #ccc;
-        -moz-border-radius-topright: 4px;
-        -khtml-border-top-right-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-right-radius: 4px;
+        border-top: 1px solid #ccc !important;
+        -moz-border-radius-topright: 4px !important;
+        -khtml-border-top-right-radius: 4px !important;
+        -webkit-border-top-right-radius: 4px !important;
+        border-top-right-radius: 4px !important;
 }
 
@@ -142 +144 @@
 
 #wp-admin-bar img.avatar {
-        float: left;
-        border: 2px solid #fff !important;
-        margin-right: 8px;
+        float: left !important;
+        border: 2px solid #fff !important !important;
+        margin-right: 8px !important;
 }
 
 #wp-admin-bar span.activity {
-        display: block;
-        color: #888;
-        margin-left: 34px;
+        display: block !important;
+        color: #888 !important;
+        margin-left: 34px !important;
         font-size: 10px !important;
         background: none !important;
@@ -158 +160 @@
 
 #wp-admin-bar li a:hover span.activity {
-        color: #ccc;
+        color: #ccc !important;
 }
 
 #wp-admin-bar ul.author-list li {
-        height: 55px;
+        height: 55px !important;
 }
 
 #wp-admin-bar ul li#notifications_menu a span {
-        background: #fff;
-        padding: 0 6px;
-        color: #555;
+        background: #fff !important;
+        padding: 0 6px !important;
+        color: #555 !important;
         font-weight: bold !important;
         font-size: 0.8em !important;
-        -moz-border-radius: 2px;
-        -khtml-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        margin-left: 2px;
+        -moz-border-radius: 2px !important;
+        -khtml-border-radius: 2px !important;
+        -webkit-border-radius: 2px !important;
+        margin-left: 2px !important;
 }

trunk/bp-friends.php

@@ -230 +230 @@
 }
 
-function friends_format_notifications( $action, $item_id, $total_items ) {
+function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
         global $bp;
         

trunk/bp-groups.php

@@ -3 +3 @@
 
 define ( 'BP_GROUPS_IS_INSTALLED', 1 );
-define ( 'BP_GROUPS_VERSION', '0.1.4' );
+define ( 'BP_GROUPS_VERSION', '0.2.1' );
 
 include_once( 'bp-groups/bp-groups-classes.php' );
@@ -52 +52 @@
                         user_title varchar(100) NOT NULL,
                         date_modified datetime NOT NULL,
+                        comments longtext NOT NULL,
                         is_confirmed tinyint(1) NOT NULL DEFAULT '0',
                         PRIMARY KEY  (id),
@@ -115 +116 @@
                 $bp['groups']['table_name_wire'] = $wpdb->base_prefix . 'bp_groups_wire';
         
-        $bp['groups']['forbidden_names'] = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add' );
+        $bp['groups']['forbidden_names'] = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' );
 
         return $bp;
@@ -153 +154 @@
                 
                 /* Is the logged in user a member of the group? */
-                $is_member = ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) ? true : false;
+                $is_member = ( groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) ? true : false;
         
                 /* Should this group be visible to the logged in user? */
@@ -201 +202 @@
                         
                         bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_group_home', 'home' );
-                        bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home', $is_visible );
+                        bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home' );
                         
                         // If the user is a group administrator, then show the group admin nav item */
@@ -207 +208 @@
                                 bp_core_add_subnav_item( $bp['groups']['slug'], 'admin', __('Admin', 'buddypress'), $group_link , 'groups_screen_group_admin', 'group-admin', $bp['is_item_admin'] );
                         
+                        // If this is a closed group, and the user is not a member, show a "Request Membership" nav item.
+                        if ( $group_obj->status == 'private' && ( !groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) && !groups_check_for_membership_request( $bp['loggedin_userid'], $group_obj->id ) ) )
+                                bp_core_add_subnav_item( $bp['groups']['slug'], 'request-membership', __('Request Membership', 'buddypress'), $group_link , 'groups_screen_group_request_membership', 'request-membership' );
+                                
                         bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum', $is_visible);
                         
@@ -220 +225 @@
                         
                         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', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite', $is_member );
+                                if ( function_exists('friends_install') )
+                                        bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite', $is_member );
+                                
                                 bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave', $is_member );
                         }
@@ -426 +433 @@
         
         if ( $is_single_group ) {
-                if ( isset($bp['action_variables']) && $bp['action_variables'][1] == 'yes' ) {
+                if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'yes' ) {
                         // remove the user from the group.
                         if ( !groups_leave_group( $group_obj->id ) ) {
@@ -440 +447 @@
                         bp_catch_uri( 'groups/group-home' );
                 
-                } else if ( isset($bp['action_variables']) && $bp['action_variables'][1] == 'no' ) {
+                } else if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'no' ) {
                         bp_catch_uri( 'groups/group-home' );
                 } else {
@@ -446 +453 @@
                         bp_catch_uri( 'groups/leave-group-confirm' );
                 }
+        }
+}
+
+function groups_screen_group_request_membership() {
+        global $bp, $group_obj;
+        
+        if ( $group_obj->status == 'private' ) {
+                
+                // If the user has submitted a request, send it.
+                if ( isset( $_POST['group-request-send']) ) {
+                        if ( !groups_send_membership_request( $bp['loggedin_userid'], $group_obj->id ) ) {
+                                $bp['message'] = __( 'There was an error sending your group membership request, please try again.', 'buddypress' );
+                                $bp['message_type'] = 'error';
+                        } else {
+                                $bp['message'] = __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' );
+                                $bp['message_type'] = 'success';
+                        }
+                        add_action( 'template_notices', 'bp_core_render_notice' );
+
+                }
+                bp_catch_uri( 'groups/request-membership' );
         }
 }
@@ -512 +540 @@
 }
 add_action( 'wp', 'groups_screen_group_admin_settings', 3 );
+
+
+function groups_screen_group_admin_requests() {
+        global $bp;
+        
+        if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'membership-requests' ) {
+                
+                if ( !$bp['is_item_admin'] )
+                        return false;
+                        
+                // Remove any screen notifications
+                bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'new_membership_request' );
+                
+                $request_action = $bp['action_variables'][1];
+                $membership_id = $bp['action_variables'][2];
+
+                if ( isset($request_action) && isset($membership_id) ) {
+                        if ( $request_action == 'accept' && is_numeric($membership_id) ) {
+                                // Accept the membership request
+                                if ( !groups_accept_membership_request( $membership_id ) ) {
+                                        $bp['message'] = __( 'There was an error accepting the membership request, please try again.', 'buddypress' );
+                                        $bp['message_type'] = 'error';
+                                } else {
+                                        $bp['message'] = __( 'Group membership request accepted', 'buddypress' );
+                                        $bp['message_type'] = 'success';
+                                }
+                        } else if ( $request_action == 'reject' && is_numeric($membership_id) ) {
+                                // Reject the membership request
+                                if ( !groups_reject_membership_request( $membership_id ) ) {
+                                        $bp['message'] = __( 'There was an error rejecting the membership request, please try again.', 'buddypress' );
+                                        $bp['message_type'] = 'error';
+                                } else {
+                                        $bp['message'] = __( 'Group membership request rejected', 'buddypress' );
+                                        $bp['message_type'] = 'success';
+                                }       
+                        }
+                        add_action( 'template_notices', 'bp_core_render_notice' );
+                }
+                
+                bp_catch_uri( 'groups/admin/membership-requests' );
+        }
+}
+add_action( 'wp', 'groups_screen_group_admin_requests', 3 );
 
 
@@ -571 +642 @@
                 
         // user wants to join a group
-        if ( !BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
+        if ( !groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
                 if ( !groups_join_group($group_obj->id) ) {
                         $bp['message'] = __('There was an error joining the group. Please try again.', 'buddypress');
@@ -598 +669 @@
         if ( function_exists('bp_activity_record') ) {
                 extract($args);
-                bp_activity_record( $item_id, $component_name, $component_action, $is_private );
+                
+                if ( !isset($group_id) )
+                        $group_id = $item_id;
+                
+                $group = new BP_Groups_Group( $group_id, false, false );
+                
+                if ( $group->status == 'public' )
+                        bp_activity_record( $item_id, $component_name, $component_action, $is_private );
         } 
 }
@@ -649 +727 @@
 }
 
+function groups_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
+        global $bp;
+        
+        switch ( $action ) {
+                case 'new_membership_request':
+                        $group_id = $secondary_item_id;
+                        $requesting_user_id = $item_id;
+                        
+                        $group = new BP_Groups_Group( $group_id, false, false );
+                        
+                        if ( (int)$total_items > 1 ) {
+                                return '<a href="' . bp_group_permalink( $group, false ) . '/admin/membership-requests/" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"'), (int)$total_items, $group->name ) . '</a>';          
+                        } else {
+                                $user_fullname = bp_core_global_user_fullname( $requesting_user_id );
+                                $user_url = bp_core_get_userurl( $requesting_user_id );
+                                return '<a href="' . bp_group_permalink( $group, false ) . '/admin/membership-requests/" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"'), $user_fullname, $group->name ) . '</a>';
+                        }       
+                break;
+        }
+        
+        return false;
+}
+
 /**************************************************************************
  groups_update_last_activity()
@@ -672 +773 @@
  **************************************************************************/
 
-function groups_get_user_groups( $pag_page, $pag_num ) {
+function groups_get_user_groups( $pag_num, $pag_page ) {
         global $bp;
         
@@ -760 +861 @@
 }
 
+
+function groups_search_groups( $search_terms, $pag_num_per_page = 5, $pag_page = 1 ) {
+        return BP_Groups_Group::search_groups( $search_terms, $pag_num_per_page, $pag_page );
+}
+
+function groups_filter_user_groups( $filter, $pag_num_per_page = 5, $pag_page = 1 ) {
+        return BP_Groups_Group::filter_user_groups( $filter, $pag_num_per_page, $pag_page );
+}
 
 /**************************************************************************
@@ -986 +1095 @@
 }
 
-function groups_leave_group( $group_id ) {
-        global $bp;
-        
+function groups_check_group_exists( $group_id ) {
+        return BP_Groups_Group::group_exists( $group_id );
+}
+
+function groups_leave_group( $group_id, $user_id = false ) {
+        global $bp;
+        
+        if ( !$user_id )
+                $user_id = $bp['loggedin_userid'];
+                
         // This is exactly the same as deleting and invite, just is_confirmed = 1 NOT 0.
-        if ( !groups_uninvite_user( $bp['loggedin_userid'], $group_id ) )
+        if ( !groups_uninvite_user( $user_id, $group_id ) )
                 return false;
 
@@ -1001 +1117 @@
 }
 
-function groups_join_group( $group_id ) {
-        global $bp;
+function groups_join_group( $group_id, $user_id = false ) {
+        global $bp;
+        
+        if ( !$user_id )
+                $user_id = $bp['loggedin_userid'];
         
         $new_member = new BP_Groups_Member;
         $new_member->group_id = $group_id;
-        $new_member->user_id = $bp['loggedin_userid'];
+        $new_member->user_id = $user_id;
         $new_member->inviter_id = 0;
         $new_member->is_admin = 0;
@@ -1028 +1147 @@
 }
 
+function groups_get_group_admin( $group_id ) {
+        return BP_Groups_Member::get_group_administrator_id( $group_id );
+}
+
 function groups_new_wire_post( $group_id, $content ) {
         if ( $wire_post_id = bp_wire_new_post( $group_id, $content ) ) {
                 
                 /* 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 ) );
+                do_action( 'activity_groups_new_wire_post', array( 'item_id' => $wire_post_id, 'group_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post', 'is_private' => 0 ) );
                 
                 /* regular action */
@@ -1068 +1191 @@
         if ( $notify_members )
                 groups_notification_group_updated( $group->id );
+
+        do_action( 'bp_groups_details_updated', $group->id );
         
         return true;
@@ -1085 +1210 @@
                 return false;
         
+        do_action( 'bp_groups_settings_updated', $group->id );
+        
         return true;
+}
+
+function groups_send_membership_request( $requesting_user_id, $group_id ) {
+        global $bp;
+
+        $requesting_user = new BP_Groups_Member;
+        $requesting_user->group_id = $group_id;
+        $requesting_user->user_id = $requesting_user_id;
+        $requesting_user->inviter_id = 0;
+        $requesting_user->is_admin = 0;
+        $requesting_user->user_title = '';
+        $requesting_user->date_modified = time();
+        $requesting_user->is_confirmed = 0;
+        $requesting_user->comments = $_POST['group-request-membership-comments'];
+        
+        if ( $requesting_user->save() ) {
+                $admin = groups_get_group_admin( $group_id );
+                
+                // Saved okay, now send the email notification
+                groups_notification_new_membership_request( $requesting_user_id, $admin->user_id, $group_id, $requesting_user->id );
+                
+                do_action( 'bp_groups_group_membership_requested', $requesting_user_id, $admin->user_id, $group_id, $requesting_user->id );
+        
+                return true;
+        }
+        
+        return false;
+}
+
+function groups_accept_membership_request( $membership_id ) {
+        $membership = new BP_Groups_Member( false, false, $membership_id );
+        $membership->accept_request();
+        
+        if ( !$membership->save() )
+                return false;
+        
+        return true;
+}
+
+function groups_reject_membership_request( $membership_id ) {
+        $membership = new BP_Groups_Member( false, false, $membership_id );
+        
+        if ( !BP_Groups_Member::delete( $membership->user_id, $membership->group_id ) )
+                return false;
+        
+        return true;
+}
+
+function groups_check_for_membership_request( $user_id, $group_id ) {
+        return BP_Groups_Member::check_for_membership_request( $user_id, $group_id );
 }
 

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

@@ -40 +40 @@
 add_action( 'wp_ajax_groups_invite_user', 'groups_ajax_invite_user' );
 
-function groups_ajax_group_search() {
+function groups_ajax_group_filter() {
         global $bp;
 
-        check_ajax_referer('group_search');
-
-        $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
-        $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 5;
-        $total_group_count = 0;
-
-        if ( $_POST['group-search-box'] == "" ) {
-                $groups = groups_get_user_groups( $pag_page, $pag_num );
-        } else {
-                $groups = BP_Groups_Group::search_user_groups( $_POST['group-search-box'], $pag_num, $pag_page );
-        }
+        check_ajax_referer('group-filter-box');
         
-        $total_group_count = (int)$groups['count'];
-
-        if ( $total_group_count ) {
-                $pag_links = paginate_links( array(
-                        'base' => $bp['current_domain'] . $bp['groups']['slug'] . add_query_arg( 'mpage', '%#%' ),
-                        'format' => '',
-                        'total' => ceil($total_group_count / $pag_num),
-                        'current' => $pag_page,
-                        'prev_text' => '«',
-                        'next_text' => '»',
-                        'mid_size' => 1
-                ));
-        }
-        
-        if ( $groups['groups'] ) {
-                echo '0[[SPLIT]]'; // return valid result.
-        
-                for ( $i = 0; $i < count($groups['groups']); $i++ ) {
-                        $group = $groups['groups'][$i];
-                        ?>
-                        <li>
-                                <img class="avatar" alt="Group Avatar" src="<?php echo $group->avatar_thumb ?>"/>
-                                <h4>
-                                        <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
-                                        <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members', 'buddypress') ?></span>
-                                </h4>
-                                <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
-                        </li>
-                        <?php   
-                }
-                echo '[[SPLIT]]' . $pag_links;
-        } else {
-                $result['message'] = '<img src="' . $bp['groups']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-                echo "-1[[SPLIT]]" . __("No groups matched your search.", 'buddypress');
-        }
+        load_template( get_template_directory() . '/groups/group-loop.php' );
 }
-add_action( 'wp_ajax_group_search', 'groups_ajax_group_search' );
+add_action( 'wp_ajax_group_filter', 'groups_ajax_group_filter' );
 
 function groups_ajax_group_finder_search() {
         global $bp;
 
-        check_ajax_referer('groupfinder_search');
+        check_ajax_referer('groupfinder-search-box');
 
-        $pag_page = isset( $_POST['fpage'] ) ? intval( $_POST['fpage'] ) : 1;
-        $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 5;
-        $total_group_count = 0;
-
-        if ( $_POST['groupfinder-search-box'] != "" ) {
-                $groups = BP_Groups_Group::search_groups( $_POST['groupfinder-search-box'], $pag_num, $pag_page );
-        }
-        
-        $total_group_count = (int)$groups['count'];
-
-        if ( $total_group_count ) {
-                $pag_links = paginate_links( array(
-                        'base' => $bp['current_domain'] . $bp['groups']['slug'] . add_query_arg( 'mpage', '%#%' ),
-                        'format' => '',
-                        'total' => ceil($total_group_count / $pag_num),
-                        'current' => $pag_page,
-                        'prev_text' => '&laquo;',
-                        'next_text' => '&raquo;',
-                        'mid_size' => 1
-                ));
-        }
-        
-        if ( $groups['groups'] ) {
-                echo '0[[SPLIT]]'; // return valid result.
-        
-                for ( $i = 0; $i < count($groups['groups']); $i++ ) {
-                        $group = $groups['groups'][$i];
-                        ?>
-                        <li>
-                                <img class="avatar" alt="Group Avatar" src="<?php echo $group->avatar_thumb ?>"/>
-                                <h4>
-                                        <a href="<?php bp_group_permalink( $group ) ?>"><?php echo $group->name ?></a>
-                                        <span class="small"> - <?php echo $group->total_member_count . ' ' . __('members', 'buddypress') ?></span>
-                                </h4>
-                                <p class="desc"><?php echo bp_create_excerpt( $group->description, 20 ) ?></p>
-                        </li>
-                        <?php   
-                }
-                echo '[[SPLIT]]' . $pag_links;
-        } else {
-                $result['message'] = '<img src="' . $bp['groups']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
-                echo "-1[[SPLIT]]" . __("No groups matched your search.", 'buddypress');
-        }
+        load_template( get_template_directory() . '/groups/group-loop.php' );
 }
 add_action( 'wp_ajax_group_finder_search', 'groups_ajax_group_finder_search' );

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

@@ -46 +46 @@
                 if ( $group ) {
                         $this->creator_id = $group->creator_id;
-                        $this->name = $group->name;
+                        $this->name = stripslashes($group->name);
                         $this->slug = $group->slug;
-                        $this->description = $group->description;
-                        $this->news = $group->news;
+                        $this->description = stripslashes($group->description);
+                        $this->news = stripslashes($group->news);
                         $this->status = $group->status;
                         $this->is_invitation_only = $group->is_invitation_only;
@@ -165 +165 @@
                 }
                 
-                $result = $wpdb->query($sql);
-                
-                if ( $wpdb->insert_id )
-                        $this->id = $wpdb->insert_id;
-                
-                return $result;
+                if ( !$result = $wpdb->query($sql) )
+                        return false;
+                
+                $this->id = $wpdb->insert_id;
+                return true;
         }
         
@@ -217 +216 @@
                 
         }
+        
+        function is_member() {
+                global $bp;
+                
+                for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
+                        if ( $this->user_dataset[$i]->user_id == $bp['loggedin_userid'] ) {
+                                return true;
+                        }
+                }       
+                
+                return false;
+        }
 
         /* Static Functions */
@@ -253 +264 @@
         }
         
-        function search_user_groups( $filter, $limit = null, $page = null ) {
+        function filter_user_groups( $filter, $limit = null, $page = null ) {
                 global $wpdb, $bp;
                 
@@ -262 +273 @@
                 
                 // Get all the group ids for the current user's groups.
-                $gids = BP_Groups_Member::get_group_ids( $user_id );
+                $gids = BP_Groups_Member::get_group_ids( $bp['current_userid'], false, false, false );
                 $gids = implode( ',', $gids['ids'] );
 
@@ -286 +297 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
                 
-                $sql = $wpdb->prepare( "SELECT id FROM " . $bp['groups']['table_name'] . " WHERE name LIKE '$filter%%' OR description LIKE '$filter%%'$pag_sql" );
-                $count_sql = $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name'] . " WHERE name LIKE '$filter%%' OR description LIKE '$filter%%'" );
+                $sql = $wpdb->prepare( "SELECT id FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' AND name LIKE '$filter%%' OR description LIKE '$filter%%'$pag_sql" );
+                $count_sql = $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' AND name LIKE '$filter%%' OR description LIKE '$filter%%'" );
                 
                 $group_ids = $wpdb->get_col($sql);
                 $total_groups = $wpdb->get_var($count_sql);
-
+                
                 for ( $i = 0; $i < count($group_ids); $i++ ) {
                         $groups[] = new BP_Groups_Group( (int)$group_ids[$i] );
@@ -315 +326 @@
                 
                 $members = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d", $group_id ) );                                              
-                
-                if ( $members < 1 )
+
+                if ( !$members )
                         return false;
                 
                 return true;
+        }
+        
+        function has_membership_requests( $group_id ) {
+                global $wpdb, $bp;
+                
+                return $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0", $group_id ) );                                             
+        }
+        
+        function get_membership_requests( $group_id, $limit = null, $page = null ) {
+                global $wpdb, $bp;
+                
+                if ( $limit && $page )
+                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+                
+                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0{$pag_sql}", $group_id ) );                       
         }
         
@@ -328 +354 @@
                         $limit = 5;
 
-                return $wpdb->get_results( $wpdb->prepare( "SELECT id as group_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'] . " WHERE status != 'hidden' ORDER BY date_created DESC LIMIT %d", $limit ) ); 
         }
         
@@ -337 +363 @@
                         $limit = 5;
 
-                return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'last_activity' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) ); 
+                return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " gm, " . $bp['groups']['table_name'] . " g WHERE g.id = gm.group_id AND g.status != 'hidden' AND meta_key = 'last_activity' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) ); 
         }
         
@@ -346 +372 @@
                         $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 CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) ); 
+                return $wpdb->get_results( $wpdb->prepare( "SELECT gm.group_id FROM " . $bp['groups']['table_name_groupmeta'] . " gm, " . $bp['groups']['table_name'] . " g WHERE g.id = gm.group_id AND g.status != 'hidden' AND meta_key = 'total_member_count' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) ); 
         }
 }
@@ -359 +385 @@
         var $date_modified;
         var $is_confirmed;
+        var $comments;
         
         var $user;
         
-        function bp_groups_member( $user_id = null, $group_id = null, $populate = true ) {
-                if ( $user_id && $group_id ) {
+        function bp_groups_member( $user_id = false, $group_id = false, $id = false, $populate = true ) {
+                if ( $user_id && $group_id && !$id ) {
                         $this->user_id = $user_id;
                         $this->group_id = $group_id;
@@ -370 +397 @@
                                 $this->populate();
                 }
+                
+                if ( $id ) {
+                        $this->id = $id;
+                        
+                        if ( $populate )
+                                $this->populate();
+                }               
         }
         
         function populate() {
                 global $wpdb, $bp;
-
-                $sql = $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
+                
+                if ( $this->user_id && $this->group_id && !$this->id )
+                        $sql = $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
+                
+                if ( $this->id )
+                        $sql = $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE id = %d", $this->id );
+                        
                 $member = $wpdb->get_row($sql);
                 
                 if ( $member ) {
                         $this->id = $member->id;
+                        $this->group_id = $member->group_id;
+                        $this->user_id = $member->user_id;
                         $this->inviter_id = $member->inviter_id;
                         $this->is_admin = $member->is_admin;
@@ -385 +426 @@
                         $this->date_modified = $member->date_modified;
                         $this->is_confirmed = $member->is_confirmed;
+                        $this->comments = $member->comments;
                         
                         $this->user = new BP_Core_User( $this->user_id );
@@ -394 +436 @@
                 
                 if ( $this->id ) {
-                        $sql = $wpdb->prepare( "UPDATE " . $bp['groups']['table_name_members'] . " SET inviter_id = %d, is_admin = %d, user_title = %s, date_modified = FROM_UNIXTIME(%d), is_confirmed = %d WHERE id = %d", $this->inviter_id, $this->is_admin, $this->user_title, $this->date_modified, $this->is_confirmed, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE " . $bp['groups']['table_name_members'] . " SET inviter_id = %d, is_admin = %d, user_title = %s, date_modified = FROM_UNIXTIME(%d), is_confirmed = %d, comments = %s WHERE id = %d", $this->inviter_id, $this->is_admin, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->id );
                 
                 } else {
-                        $sql = $wpdb->prepare( "INSERT INTO " . $bp['groups']['table_name_members'] . " ( user_id, group_id, inviter_id, is_admin, user_title, date_modified, is_confirmed ) VALUES ( %d, %d, %d, %d, %s, FROM_UNIXTIME(%d), %d )", $this->user_id, $this->group_id, $this->inviter_id, $this->is_admin, $this->user_title, $this->date_modified, $this->is_confirmed );
-                }
-
-                if ( !$result = $wpdb->query($sql) )
+                        $sql = $wpdb->prepare( "INSERT INTO " . $bp['groups']['table_name_members'] . " ( user_id, group_id, inviter_id, is_admin, user_title, date_modified, is_confirmed, comments ) VALUES ( %d, %d, %d, %d, %s, FROM_UNIXTIME(%d), %d, %s )", $this->user_id, $this->group_id, $this->inviter_id, $this->is_admin, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments );
+                }
+
+                if ( !$wpdb->query($sql) )
                         return false;
                 
+                $this->id = $wpdb->insert_id;
                 return true;
         }
@@ -418 +461 @@
                 $this->date_modified = time();
         }
+        
+        function accept_request() {
+                $this->is_confirmed = 1;
+                $this->date_modified = time();          
+        }
                 
         /* Static Functions */
@@ -434 +482 @@
         }
         
-        function get_group_ids( $user_id, $page = false, $limit = false ) {
+        function get_group_ids( $user_id, $page = false, $limit = false, $get_total = true ) {
                 global $wpdb, $bp;
                 
                 if ( $limit && $page )
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-                $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1$pag_sql", $user_id ) );
-                $group_count = BP_Groups_Member::total_group_count( $user_id );
+                
+                // If the user is logged in and viewing their own groups, we can show hidden and closed groups
+                if ( bp_is_home() ) {
+                        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d $pag_sql", $user_id ) );     
+                } else {
+                        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM " . $bp['groups']['table_name_members'] . " m, " . $bp['groups']['table_name'] . " g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d$pag_sql", $user_id ) );  
+                }
+                
+                if ( $get_total )
+                        $group_count = BP_Groups_Member::total_group_count( $user_id );
         
                 return array( 'ids' => $group_ids, 'count' => $group_count );
@@ -452 +507 @@
                         $user_id = $bp['current_userid'];
                         
-                return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1", $user_id ) );
+                if ( bp_is_home() ) {
+                        return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1", $user_id ) );                        
+                } else {
+                        return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM " . $bp['groups']['table_name_members'] . " m, " . $bp['groups']['table_name'] . " g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1", $user_id ) );                  
+                }
         }
         
@@ -479 +538 @@
         }
         
+        function check_for_membership_request( $user_id, $group_id ) {
+                global $wpdb, $bp;
+                
+                return $wpdb->query( $wpdb->prepare( "SELECT id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND group_id = %d AND is_confirmed = 0", $user_id, $group_id ) );   
+        }
+        
         function get_random_groups( $user_id, $total_groups = 5 ) {
                 global $wpdb, $bp;
-
-                return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1 ORDER BY rand() LIMIT $total_groups", $user_id ) );
+                
+                // If the user is logged in and viewing their random groups, we can show hidden and closed groups
+                if ( bp_is_home() ) {
+                        return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1 ORDER BY rand() LIMIT $total_groups", $user_id ) );
+                } else {
+                        return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM " . $bp['groups']['table_name_members'] . " m, " . $bp['groups']['table_name'] . " g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 ORDER BY rand() LIMIT $total_groups", $user_id ) );                     
+                }
+        }
+        
+        function get_group_administrator_id( $group_id ) {
+                global $bp, $wpdb;
+                
+                return $wpdb->get_row( $wpdb->prepare( "SELECT user_id FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_admin = 1", $group_id ) );
         }
         

trunk/bp-groups/bp-groups-notifications.php

@@ -85 +85 @@
 }
 
+function groups_notification_new_membership_request( $requesting_user_id, $admin_id, $group_id, $membership_id ) {
+        global $bp, $current_user;
+
+        bp_core_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
+
+        if ( get_usermeta( $admin_id, 'notification_new_membership_request' ) == 'no' )
+                return false;
+                
+        $requesting_user_name = bp_fetch_user_fullname( $requesting_user_id, false );
+        $group = new BP_Groups_Group( $group_id, false, false );
+        
+        $ud = get_userdata($admin_id);
+        $requesting_ud = get_userdata($requesting_user_id);
+
+        $group_request_accept = bp_group_permalink( $group, false ) . '/admin/membership-requests/accept/' . $membership_id;
+        $group_request_reject = bp_group_permalink( $group, false ) . '/admin/membership-requests/reject/' . $membership_id;
+        $profile_link = site_url() . '/' . MEMBERS_SLUG . '/' . $requesting_ud->user_login . '/profile';
+        $settings_link = site_url() . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
+
+        // Set up and send the message
+        $to = $ud->user_email;
+        $subject = sprintf( __( 'Membership request for group: %s', 'buddypress' ), stripslashes($group->name) );
+
+$message = sprintf( __( 
+'%s wants to join the group "%s".
+
+Because you are the administrator of this group, you must either accept or reject the membership request.
+
+To accept the membership request: %s
+To reject the membership request: %s
+To view %s\'s profile: %s
+
+---------------------
+', 'buddypress' ), $requesting_user_name, stripslashes($group->name), $group_request_accept, $group_request_reject, $requesting_user_name, $profile_link );
+
+        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+
+        // Send it
+        wp_mail( $to, $subject, $message );     
+}
+
 ?>

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

@@ -16 +16 @@
         function bp_groups_template( $user_id = null, $group_slug = null ) {
                 global $bp;
-
-                $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
-                $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 5;
-
-                if ( $bp['current_action'] == 'my-groups' || !$bp['current_action'] ) {
-                
-                        $this->groups = groups_get_user_groups( $this->pag_page, $this->pag_num );
+                
+                $this->pag_page = isset( $_REQUEST['fpage'] ) ? intval( $_REQUEST['fpage'] ) : 1;
+                $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : 5;
+                
+                if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] == '' ) || !$bp['current_action'] ) {
+                        
+                        $this->groups = groups_get_user_groups( $this->pag_num, $this->pag_page );
                         $this->total_group_count = (int)$this->groups['count'];
                         $this->groups = $this->groups['groups'];
                         $this->group_count = count($this->groups);
                 
+                } else if ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) {
+
+                        $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
+                        $this->total_group_count = (int)$this->groups['count'];
+                        $this->groups = $this->groups['groups'];
+                        $this->group_count = count($this->groups);
+                
+                } else if ( $bp['current_action'] == 'group-finder' && $_REQUEST['groupfinder-search-box'] != '' ) {
+
+                        $this->groups = groups_search_groups( $_REQUEST['groupfinder-search-box'], $this->pag_num, $this->pag_page );
+                        $this->total_group_count = (int)$this->groups['count'];
+                        $this->groups = $this->groups['groups'];
+                        $this->group_count = count($this->groups);
+                        
                 } else if ( $bp['current_action'] == 'invites' ) {
                 
@@ -121 +135 @@
 }
 
+function bp_group_is_visible() {
+        global $bp, $groups_template;
+        
+        if ( $groups_template->group->status == 'public' ) {
+                return true;
+        } else {
+                if ( groups_is_user_member( $bp['loggedin_userid'], $groups_template->group->id ) ) {
+                        return true;
+                }
+        }
+        
+        return false;
+}
+
 function bp_group_id( $echo = true ) {
         global $groups_template;
@@ -235 +263 @@
         }
 
-function bp_group_invitation_status() {
-        global $groups_template;
-        
-        if ( $groups_template->group->is_invitation_only ) {
-                _e('Invitation Only', 'buddypress');
-        } else {
-                _e('Open', 'buddypress');
-        }
-}
-        function bp_group_is_invitation_only() {
-                global $groups_template;
-                return $groups_template->group->is_invitation_only;
-        }
 
 function bp_group_date_created() {
@@ -301 +316 @@
                 $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
                 $label = __('Filter Groups', 'buddypress');
-                $type = 'group';
+                $name = 'group-filter-box';
         } else {
                 $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
                 $label = __('Find a Group', 'buddypress');
-                $type = 'groupfinder';
-                $value = $bp['action_variables'][1];
-        }
-
-        if ( !$groups_template->group_count && $bp['current_action'] != 'group-finder' ) {
-                $disabled = ' disabled="disabled"';
+                $name = 'groupfinder-search-box';
+                $value = $bp['action_variables'][0];
         }
 ?>
         <form action="<?php echo $action ?>" id="group-search-form" method="post">
-                <label for="<?php echo $type ?>-search-box" id="<?php echo $type ?>-search-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
-                <input type="search" name="<?php echo $type ?>-search-box" id="<?php echo $type ?>-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
+                <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
+                <input type="search" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo $value ?>"<?php echo $disabled ?> />
                 <?php if ( function_exists('wp_nonce_field') )
-                        wp_nonce_field( $type . '_search' );
+                        wp_nonce_field( $name );
                 ?>
         </form>
 <?php
+}
+
+function bp_group_show_no_groups_message() {
+        global $bp;
+        
+        if ( $bp['current_action'] == 'group-finder' )
+                return false;
+        
+        return true;
 }
 
@@ -396 +416 @@
         <!--<li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>-->
         <!--<li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>-->
+        <?php if ( $groups_template->group->status == 'private' ) : ?>
+        <li<?php if ( $current_tab == 'membership-requests' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
+        <?php endif; ?>
 <?php
         do_action( 'bp_groups_admin_tabs' );
 }
 
+function bp_group_form_action( $page ) {
+        global $bp, $groups_template;
+        
+        echo bp_group_permalink( $group, false ) . '/' . $page;
+}
+
 function bp_group_admin_form_action( $page ) {
         global $bp, $groups_template;
         
         echo bp_group_permalink( $group, false ) . '/admin/' . $page;
+}
+
+function bp_group_has_requested_membership() {
+        global $bp, $groups_template;
+        
+        if ( groups_check_for_membership_request( $bp['loggedin_userid'], $groups_template->group->id ) )
+                return true;
+        
+        return false;
 }
 
@@ -461 +499 @@
                 <?php case '2': ?>
                         <?php if ( $completed_to_step > 0 ) { ?>
+                                <?php if ( function_exists('bp_wire_install') ) : ?>
                                 <div class="checkbox">
                                         <label><input type="checkbox" name="group-show-wire" id="group-show-wire" value="1"<?php if ( $group_obj->enable_wire ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable comment wire', 'buddypress') ?></label>
                                 </div>
+                                <?php endif; ?>
+                                
+                                <?php if ( function_exists('bp_forum_install') ) : ?>
                                 <div class="checkbox">
                                         <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( $group_obj->enable_forum ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum', 'buddypress') ?></label>
                                 </div>
+                                <?php endif; ?>
+                                
+                                <?php if ( function_exists('bp_albums_install') ) : ?>
                                 <div class="checkbox with-suboptions">
                                         <label><input type="checkbox" name="group-show-photos" id="group-show-photos" value="1"<?php if ( $group_obj->enable_photos ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable photo gallery', 'buddypress') ?></label>
@@ -474 +519 @@
                                         </div>
                                 </div>
+                                <?php endif; ?>
                         
                                 <h3><?php _e('Privacy Options', 'buddypress'); ?></h3>
@@ -590 +636 @@
                         <?php echo $member->user->avatar_thumb ?>
                         <p><?php echo $member->user->user_link ?> <?php if ( $member->user_title ) { ?><?php echo '<span class="small">- ' . $member->user_title . '</span>' ?><?php } ?></p>
-                        <span class="activity">joined <?php echo bp_core_time_since( strtotime($member->date_modified) ) ?> ago</span>
+                        <span class="activity"><?php echo sprintf( __( 'joined %s ago', 'buddypress' ), bp_core_time_since( strtotime( $member->date_modified ) ) ); ?></span>
         <?php if ( bp_exists('friends') && function_exists('bp_add_friend_button') ) { ?>
                         <div class="action">
@@ -653 +699 @@
                                         <?php echo $user->avatar_thumb ?>
                                         <h4><?php echo $user->user_link ?></h4>
-                                        <span class="activity">active <?php echo $user->last_active ?> ago</span>
+                                        <span class="activity"><?php echo $user->last_active ?></span>
                                         <div class="action">
                                                 <a class="remove" href="<?php echo site_url() . $bp['groups']['slug'] . '/' . $group_obj->id . '/invites/remove/' . $user->id ?>" id="uid-<?php echo $user->id ?>">Remove Invite</a> 
@@ -676 +722 @@
         global $bp, $groups_template;
         
-        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_group_permalink( false, false ) . '/join">' . __('Join Group', 'buddypress') . '</a>';
+        if ( !is_user_logged_in() || BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $groups_template->group->id ) )
+                return false;
+                
+        switch ( $groups_template->group->status ) {
+                case 'public':
+                        echo '<a class="join-group" href="' . bp_group_permalink( false, false ) . '/join">' . __('Join Group', 'buddypress') . '</a>';                                 
+                break;
+                
+                case 'private':
+                        if ( !bp_group_has_requested_membership() )
+                                echo '<a class="request-membership" href="' . bp_group_permalink( false, false ) . '/request-membership">' . __('Request Membership', 'buddypress') . '</a>';           
+                        else
+                                echo 'Membership Requested';
+                break;
+        }
+}
+
+function bp_group_status_message() {
+        global $groups_template;
+        
+        if ( $groups_template->group->status == 'private' ) {
+                if ( !bp_group_has_requested_membership() )
+                        _e( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
+                else 
+                        _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );                      
+        } else {
+                _e( 'This is a hidden group and only invited members can join.', 'buddypress' );
         }
 }
@@ -708 +779 @@
 }
 
+/****
+ * Membership Requests Template Tags
+ **/
+
+class BP_Groups_Membership_Requests_Template {
+        var $current_request = -1;
+        var $request_count;
+        var $requests;
+        var $request;
+        
+        var $in_the_loop;
+        
+        var $pag_page;
+        var $pag_num;
+        var $pag_links;
+        var $total_request_count;
+        
+        function bp_groups_membership_requests_template( $group_id = null ) {
+                global $bp;
+                
+                $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
+                $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : 5;
+                
+                $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
+                $this->request_count = count($this->requests);
+                
+                $this->total_request_count = (int) BP_Groups_Group::has_membership_requests( $group_id );
+
+                $this->pag_links = paginate_links( array(
+                        'base' => add_query_arg( 'mrpage', '%#%' ),
+                        'format' => '',
+                        'total' => ceil( $this->total_request_count / $this->pag_num ),
+                        'current' => $this->pag_page,
+                        'prev_text' => '&laquo;',
+                        'next_text' => '&raquo;',
+                        'mid_size' => 1
+                ));
+                
+        }
+        
+        function has_requests() {
+                if ( $this->request_count )
+                        return true;
+                
+                return false;
+        }
+        
+        function next_request() {
+                $this->current_request++;
+                $this->request = $this->requests[$this->current_request];
+                
+                return $this->request;
+        }
+        
+        function rewind_requests() {
+                $this->current_request = -1;
+                if ( $this->request_count > 0 ) {
+                        $this->request = $this->requests[0];
+                }
+        }
+        
+        function requests() { 
+                if ( $this->current_request + 1 < $this->request_count ) {
+                        return true;
+                } elseif ( $this->current_request + 1 == $this->request_count ) {
+                        do_action('loop_end');
+                        // Do some cleaning up after the loop
+                        $this->rewind_requests();
+                }
+
+                $this->in_the_loop = false;
+                return false;
+        }
+        
+        function the_request() {
+                global $request;
+
+                $this->in_the_loop = true;
+                $this->request = $this->next_request();
+
+                if ( $this->current_request == 0 ) // loop has just started
+                        do_action('loop_start');
+        }
+}
+
+function bp_group_has_membership_requests() {
+        global $requests_template, $groups_template;
+        
+        $requests_template = new BP_Groups_Membership_Requests_Template( $groups_template->group->id );
+
+        return $requests_template->has_requests();
+}
+
+function bp_group_membership_requests() {
+        global $requests_template;
+        
+        return $requests_template->requests();
+}
+
+function bp_group_the_membership_request() {
+        global $requests_template;
+        
+        return $requests_template->the_request();
+}
+
+function bp_group_request_user_avatar_thumb() {
+        global $requests_template;
+        
+        echo bp_core_get_avatar( $requests_template->request->user_id, 1 );
+}
+
+function bp_group_request_reject_link() {
+        global $requests_template, $groups_template;    
+
+        echo bp_group_permalink( $groups_template->group, false ) . '/admin/membership-requests/reject/' . $requests_template->request->id;
+}
+
+function bp_group_request_accept_link() {
+        global $requests_template, $groups_template;    
+
+        echo bp_group_permalink( $groups_template->group, false ) . '/admin/membership-requests/accept/' . $requests_template->request->id;
+}
+
+function bp_group_request_time_since_requested() {
+        global $requests_template;      
+
+        echo sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $requests_template->request->date_modified ) ) );
+}
+
+function bp_group_request_comment() {
+        global $requests_template;
+        
+        echo strip_tags( stripslashes( $requests_template->request->comments ) );
+}
+
+function bp_group_request_user_link() {
+        global $requests_template;
+        
+        echo bp_core_get_userlink( $requests_template->request->user_id );
+}
+
 ?>

trunk/bp-groups/js/general.js

@@ -78 +78 @@
 
                         jQuery.post( ajaxurl, {
-                                action: 'group_search',
+                                action: 'group_filter',
                                 'cookie': encodeURIComponent(document.cookie),
                                 '_wpnonce': jQuery("input#_wpnonce").val(),
@@ -84 +84 @@
                                 'num': 5,
 
-                                'group-search-box': jQuery("#group-search-box").val()
-                        },
-                        function(response)
-                        {       
-                                render_group_search_response(response);
+                                'group-filter-box': jQuery("#group-filter-box").val()
+                        },
+                        function(response)
+                        {       
+                                response = response.substr( 0, response.length - 1 );
+                                
+                                jQuery("div#group-loop").fadeOut(200, 
+                                        function() {
+                                                jQuery('#ajax-loader').toggle();
+                                                jQuery("div#group-loop").html(response);
+                                                jQuery("div#group-loop").fadeIn(200);
+                                        }
+                                );
                         });
                         
@@ -113 +121 @@
                         function(response)
                         {       
-                                render_group_finder_search_response(response);
-                        });
-                        
-                        return false;
-                }
-        );
-
-        jQuery("input#group-search-box").keyup( 
+                                response = response.substr( 0, response.length - 1 );
+
+                                jQuery("div#group-loop").fadeOut(200, 
+                                        function() {
+                                                jQuery('#ajax-loader').toggle();
+                                                jQuery("div#group-loop").html(response);
+                                                jQuery("div#group-loop").fadeIn(200);
+                                        }
+                                );
+                        });
+                        
+                        return false;
+                }
+        );
+
+        jQuery("input#group-filter-box").keyup( 
                 function(e) {
                         if ( e.which == 13 ) {
@@ -126 +142 @@
                                 
                                 jQuery.post( ajaxurl, {
-                                        action: 'group_search',
+                                        action: 'group_filter',
                                         'cookie': encodeURIComponent(document.cookie),
                                         '_wpnonce': jQuery("input#_wpnonce").val(),
 
-                                        'group-search-box': jQuery("#group-search-box").val()
+                                        'group-filter-box': jQuery("#group-filter-box").val()
                                 },
                                 function(response)
                                 {
-                                        render_group_search_response(response);
+                                        response = response.substr( 0, response.length - 1 );
+
+                                        jQuery("div#group-loop").fadeOut(200, 
+                                                function() {
+                                                        jQuery('#ajax-loader').toggle();
+                                                        jQuery("div#group-loop").html(response);
+                                                        jQuery("div#group-loop").fadeIn(200);
+                                                }
+                                        );
                                 });
 
@@ -145 +169 @@
                 function(e) {
                         if ( e.which == 13 ) {
-                                jQuery('#ajax-loader').toggle();
-                                
+                                if ( jQuery("#groupfinder-search-box").val() == '' )
+                                        return false;
+                                        
+                                jQuery('#ajax-loader').toggle();
+                                        
                                 jQuery.post( ajaxurl, {
                                         action: 'group_finder_search',
@@ -156 +183 @@
                                 function(response)
                                 {
-                                        render_group_finder_search_response(response);
+                                        response = response.substr( 0, response.length - 1 );
+
+                                        jQuery("div#finder-message").fadeOut(200);
+                                        jQuery("div#group-loop").fadeOut(200, 
+                                                function() {
+                                                        jQuery('#ajax-loader').toggle();
+                                                        jQuery("div#group-loop").html(response);
+                                                        jQuery("div#group-loop").fadeIn(200);
+                                                }
+                                        );
                                 });
 
@@ -164 +200 @@
         );
 });
-
-function render_group_search_response(response) {
-        response = response.substr(0, response.length-1);
-        response = response.split('[[SPLIT]]');
-
-        if ( response[0] != "-1" ) {
-                jQuery("ul#group-list").fadeOut(200, 
-                        function() {
-                                jQuery('#ajax-loader').toggle();
-                                jQuery("ul#group-list").html(response[1]);
-                                jQuery("ul#group-list").fadeIn(200);
-                        }
-                );
-                
-                jQuery("div#pag").fadeOut(200, 
-                        function() {
-                                jQuery("div#pag").html(response[2]);
-                                jQuery("div#pag").fadeIn(200);
-                        }
-                );
-                
-        } else {
-                jQuery("ul#group-list").fadeOut(200, 
-                        function() {
-                                jQuery('#ajax-loader').toggle();
-                                jQuery("div#pag").fadeOut(200);
-                                var message = '<p><div id="message" class="error"><p>' + response[1] + '</p></div></p>';
-                                jQuery("ul#group-list").html(message);
-                                jQuery("ul#group-list").fadeIn(200);
-                        }
-                );
-        }
-                        
-        return false;
-}
-
-function render_group_finder_search_response(response) {
-        response = response.substr(0, response.length-1);
-        response = response.split('[[SPLIT]]');
-        
-        console.log(response);
-
-        jQuery('#finder-message').before('<ul id="friend-list"></ul>');
-        
-        if ( jQuery('#finder-message') ) {
-                jQuery('#finder-message').fadeOut(200);
-        }
-        
-        if ( response[0] != "-1" ) {
-                jQuery("ul#friend-list").fadeOut(200, 
-                        function() {
-                                jQuery('#ajax-loader').toggle();
-                                jQuery("ul#friend-list").html(response[1]);
-                                jQuery("ul#friend-list").fadeIn(200);
-                        }
-                );
-
-                jQuery("div#groupfinder-pag").fadeOut(200, 
-                        function() {
-                                jQuery("div#groupfinder-pag").html(response[2]);
-                                jQuery("div#groupfinder-pag").fadeIn(200);
-                        }
-                );
-
-        } else {                                        
-                jQuery("ul#friend-list").fadeOut(200, 
-                        function() {
-                                jQuery('#ajax-loader').toggle();
-                                jQuery("div#groupfinder-pag").fadeOut(200);
-                                var message = '<p><div id="message" class="error"><p>' + response[1] + '</p></div></p>';
-                                jQuery("ul#friend-list").html(message);
-                                jQuery("ul#friend-list").fadeIn(200);
-                        }
-                );
-        }
-        
-        return false;
-}

trunk/bp-xprofile.php

@@ -425 +425 @@
  * @return The readable notification item
  */
-function xprofile_format_notifications( $action, $item_id, $total_items ) {
+function xprofile_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
         global $bp;
 

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -7 +7 @@
 add_action( 'wp_head', 'xprofile_add_signup_css' );
 
+function xprofile_add_signup_js() {
+        if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
+                wp_enqueue_script( 'jquery' );
+}
+add_action( 'wp', 'xprofile_add_signup_js' );
 
 function xprofile_add_admin_css() {
@@ -15 +20 @@
 add_action( 'admin_head', 'xprofile_add_admin_css' );
 
-
-function xprofile_add_admin_js() {
-        if ( strpos( $_GET['page'], 'xprofile' ) !== false ) {
-                wp_enqueue_script( 'bp-xprofile-admin-js', site_url() . "/wp-content/mu-plugins/bp-xprofile/js/admin.js" );
-                add_action( 'admin_head', 'bp_core_add_cropper_js' );
-        }
-}
-add_action( 'admin_menu', 'xprofile_add_admin_js' );
-
 function xprofile_add_cropper_js() {
         global $bp;
 
-        if ( $_SERVER['SCRIPT_NAME'] == '/wp-activate.php' || $bp['current_action'] == 'change-avatar' || ( isset($_GET['page']) && $_GET['page'] == 'bp-xprofile.php' ) ) {
+        if ( $_SERVER['SCRIPT_NAME'] == '/wp-activate.php' || $bp['current_action'] == 'change-avatar' ) {
                 wp_enqueue_script('jquery');
                 wp_enqueue_script('prototype');