Changeset 548 for trunk/bp-groups.php

Timestamp:

11/17/2008 10:54:11 AM (16 years ago)

Author:

apeatling

Message:

Updated and fixed group invites and group invite email notifications.
Added screen notifications of group invites.

File:

• trunk/bp-groups.php (modified) (12 diffs)

trunk/bp-groups.php

@@ -3 +3 @@
 
 define ( 'BP_GROUPS_IS_INSTALLED', 1 );
-define ( 'BP_GROUPS_VERSION', '0.2.5' );
+define ( 'BP_GROUPS_VERSION', '0.2.6' );
 
 include_once( 'bp-groups/bp-groups-classes.php' );
@@ -58 +58 @@
             is_confirmed tinyint(1) NOT NULL DEFAULT '0',
             is_banned tinyint(1) NOT NULL DEFAULT '0',
+            invite_sent tinyint(1) NOT NULL DEFAULT '0',
             KEY group_id (group_id),
             KEY is_admin (is_admin),
@@ -309 +310 @@
     }
     
+    // Remove notifications
+    bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'group_invite' );
+    
     bp_catch_uri( 'groups/list-invites' );  
 }
@@ -458 +462 @@
     
     if ( $is_single_group ) {
-        if ( isset($bp['action_variables']) && $bp['action_variables'][1] == 'send' ) {
+        if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'send' ) {
             // Send the invites.
             groups_send_invites($group_obj);
@@ -865 +869 @@
             } 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>';
             }   
@@ -876 +879 @@
             
             if ( (int)$total_items > 1 ) {
-                return '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests'), (int)$total_items, $group->name ) . '</a>';      
+                return '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests'), (int)$total_items, $group->name ) . '</a>';     
             } else {
                 return '<a href="' . bp_group_permalink( $group, false ) . '/?new">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>';
@@ -886 +889 @@
             
             $group = new BP_Groups_Group( $group_id, false, false );
-
+            
             if ( (int)$total_items > 1 ) {
                 return '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests'), (int)$total_items, $group->name ) . '</a>';      
@@ -901 +904 @@
 
             if ( (int)$total_items > 1 ) {
-                return '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups'), (int)$total_items ) . '</a>';       
+                return '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups'), (int)$total_items ) . '</a>';      
             } else {
                 return '<a href="' . bp_group_permalink( $group, false ) . '/?new">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>';
@@ -913 +916 @@
 
             if ( (int)$total_items > 1 ) {
-                return '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups'), (int)$total_items ) . '</a>';      
+                return '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups'), (int)$total_items ) . '</a>';     
             } else {
                 return '<a href="' . bp_group_permalink( $group, false ) . '/?new">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>';
+            }   
+        break;
+        
+        case 'group_invite':
+            $group_id = $item_id;
+
+            $group = new BP_Groups_Group( $group_id, false, false );
+            $user_url = bp_core_get_userurl( $user_id );
+            
+            if ( (int)$total_items > 1 ) {
+                return '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations'), (int)$total_items ) . '</a>';        
+            } else {
+                return '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s'), $group->name ) . '</a>';
             }   
         break;
@@ -1242 +1258 @@
 
 
-function groups_get_invites_for_group( $group_id ) {
-    return BP_Groups_Group::get_invites( $group_id );
-}
-
-
-function groups_get_invites_for_user( $user_id = false ) {
+function groups_get_invites_for_group( $user_id, $group_id ) {
+    return BP_Groups_Group::get_invites( $user_id, $group_id );
+}
+
+function groups_check_user_has_invite( $user_id, $group_id ) {
+    BP_Groups_Member::check_has_invite( $user_id, $group_id );
+}
+
+function groups_get_invites_for_user( $user_id = false, $group_id = false ) {
     global $bp;
     
@@ -1253 +1272 @@
         $user_id = $bp['loggedin_userid'];
     
-    return BP_Groups_Member::get_invites($user_id);
+    return BP_Groups_Member::get_invites( $user_id, $group_id );
 }
 
@@ -1261 +1280 @@
     
     // Send friend invites.
-    $invited_users = groups_get_invites_for_group( $group_obj->id ); 
-    
-    for ( $i = 0; $i < count( $invited_users); $i++ ) {
-        $user_id = $invited_users[$i];
-
-        // Send the email
-
-        $invited_user = new BP_Core_User( $user_id );
-        $inviter_name = bp_core_get_userlink( $bp['loggedin_userid'], true, false, true );
-        
-        $message = "You have been invited to join the group '" . $group_obj->name . "' by " . $inviter_name . '.';
-        $message .= "\n\n";
-        $message .= "View the group: " . $invited_user->user_url . $bp['groups']['slug'] . "/" . $group_obj->slug . "\n";
-        $message .= "Accept the invite: " . $invited_user->user_url . $bp['groups']['slug'] . "/invites/accept/" . $group_obj->id . "\n";
-        $message .= "Reject the invite: " . $invited_user->user_url . $bp['groups']['slug'] . "/invites/reject/" . $group_obj->id . "\n";
-
-        wp_mail( $invited_user->email, __("New Group Invitation:", 'buddypress') . $group_obj->name, $message, "From: noreply@" . $_SERVER[ 'HTTP_HOST' ]  );
-    }
-
+    $invited_users = groups_get_invites_for_group( $bp['loggedin_userid'], $group_obj->id );
+
+    for ( $i = 0; $i < count( $invited_users ); $i++ ) {
+        $member = new BP_Groups_Member( $invited_users[$i], $group_obj->id );
+        $member->invite_sent = 1;
+        $member->save();
+    }
+    
+    groups_notification_group_invites( $group_obj->id, $invited_users, $bp['loggedin_userid'] );
+    
     do_action( 'groups_send_invites', $group_obj->id, $invited_users );
 }