Changeset 2339

Timestamp:

01/18/2010 03:52:16 PM (16 years ago)

Author:

apeatling

Message:

Fixes to group invite interface and template loop.

Location:

trunk

Files:

• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-themes/bp-default/groups/single/send-invites.php (modified) (2 diffs)
• bp-themes/bp-default/members/single/groups/invites.php (modified) (2 diffs)

trunk/bp-groups.php

@@ -2261 +2261 @@
 /*** Group Invitations *********************************************************/
 
-function groups_get_invites_for_user( $user_id = false ) {
+function groups_get_invites_for_user( $user_id = false, $limit = false, $page = false ) {
         global $bp;
 
@@ -2267 +2267 @@
                 $user_id = $bp->loggedin_user->id;
 
-        return BP_Groups_Member::get_invites( $user_id );
+        return BP_Groups_Member::get_invites( $user_id, $limit, $page );
 }
 
@@ -2287 +2287 @@
                 return false;
 
-        if ( groups_is_user_member( $user_id, $group_id ) )
-                return false;
-
-        $invite = new BP_Groups_Member;
-        $invite->group_id = $group_id;
-        $invite->user_id = $user_id;
-        $invite->date_modified = $date_modified;
-        $invite->inviter_id = $inviter_id;
-        $invite->is_confirmed = $is_confirmed;
-
-        if ( !$invite->save() )
-                return false;
-
-        do_action( 'groups_invite_user', $args );
+        if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
+                $invite = new BP_Groups_Member;
+                $invite->group_id = $group_id;
+                $invite->user_id = $user_id;
+                $invite->date_modified = $date_modified;
+                $invite->inviter_id = $inviter_id;
+                $invite->is_confirmed = $is_confirmed;
+
+                if ( !$invite->save() )
+                        return false;
+
+                do_action( 'groups_invite_user', $args );
+        }
 
         return true;

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

@@ -853 +853 @@
         }
 
-        function get_invites( $user_id ) {
-                global $wpdb, $bp;
-
-                $group_ids = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d and is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id ) );
-
-                return $group_ids;
+        function get_invites( $user_id, $limit = false, $page = false ) {
+                global $wpdb, $bp;
+
+                if ( $limit && $page )
+                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+
+                $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
+                $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d ORDER BY date_modified ASC", $user_id ) );
+
+                return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
 

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

@@ -69 +69 @@
 
                         case 'invites':
-                                if ( $user_id )
-                                        $this->groups = groups_get_invites_for_user();
+                                $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page );
                                 break;
 
@@ -81 +80 @@
 
                 if ( 'invites' == $type ) {
-                        $this->total_group_count = count($this->groups);
-                        $this->group_count = count($this->groups);
+                        $this->total_group_count = (int)$this->groups['total'];
+                        $this->group_count = (int)$this->groups['total'];
+                        $this->groups = $this->groups['groups'];
                 } else if ( 'single-group' == $type ) {
                         $this->single_group = true;

trunk/bp-themes/bp-default/groups/single/send-invites.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_group_send_invites_content' ) ?>
 
-<?php if ( bp_has_friends_to_invite() ) : ?>
+<?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
         <form action="<?php bp_group_send_invite_form_action() ?>" method="post" id="send-invite-form" class="standard-form">
@@ -70 +70 @@
 
         <div id="message" class="info">
-                <p><?php _e( 'You either need to build up your friends list, or your friends have already been invited or are current members.', 'buddypress' ); ?></p>
+                <p><?php _e( 'Once you have built up friend connections you will be able to invite others to your group. You can send invites any time in the future by selecting the "Send Invites" option when viewing your new group.', 'buddypress' ); ?></p>
         </div>
 

trunk/bp-themes/bp-default/members/single/groups/invites.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_group_invites_content' ) ?>
 
-<?php if ( bp_has_groups() ) : ?>
+<?php if ( bp_has_groups( 'type=invites&user_id=' . bp_loggedin_user_id() ) ) : ?>
 
         <ul id="group-list" class="invites item-list">
@@ -24 +24 @@
 
                                 </div>
-                                <hr />
                         </li>