Changeset 5931

Timestamp:

03/16/2012 02:57:03 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Add the ability to cancel a pending friendship request. Props ddean. Fixes #3897.

Location:

trunk

Files:

• bp-friends/bp-friends-classes.php (modified) (1 diff)
• bp-friends/bp-friends-functions.php (modified) (1 diff)
• bp-friends/bp-friends-screens.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

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

@@ -208 +208 @@
         }
 
+        public static function withdraw($friendship_id) {
+                global $wpdb, $bp;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND initiator_user_id = %d", $friendship_id, bp_loggedin_user_id() ) );
+        }
+
         public static function reject($friendship_id) {
                 global $wpdb, $bp;

trunk/bp-friends/bp-friends-functions.php

@@ -134 +134 @@
 
                 do_action_ref_array( 'friends_friendship_rejected', array( $friendship_id, &$friendship ) );
+                return true;
+        }
+
+        return false;
+}
+
+function friends_withdraw_friendship( $initiator_userid, $friend_userid ) {
+        global $bp;
+
+        $friendship_id = BP_Friends_Friendship::get_friendship_id( $initiator_userid, $friend_userid );
+        $friendship    = new BP_Friends_Friendship( $friendship_id, true, false );
+        
+        if ( !$friendship->is_confirmed && BP_Friends_Friendship::withdraw( $friendship_id ) ) {
+                // Remove the friend request notice
+                bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
+
+                do_action_ref_array( 'friends_friendship_whithdrawn', array( $friendship_id, &$friendship ) );
                 return true;
         }

trunk/bp-friends/bp-friends-screens.php

@@ -46 +46 @@
                 else
                         bp_core_add_message( __( 'Friendship could not be rejected', 'buddypress' ), 'error' );
+
+                bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );
+                
+        } elseif ( bp_is_action_variable( 'cancel', 0 ) && is_numeric( bp_action_variable( 1 ) ) ) {
+                // Check the nonce
+                check_admin_referer( 'friends_withdraw_friendship' );
+
+                if ( friends_withdraw_friendship( bp_loggedin_user_id(), bp_action_variable( 1 ) ) )
+                        bp_core_add_message( __( 'Friendship request withdrawn', 'buddypress' ) );
+                else
+                        bp_core_add_message( __( 'Friendship request could not be withdrawn', 'buddypress' ), 'error' );
 
                 bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );

trunk/bp-friends/bp-friends-template.php

@@ -319 +319 @@
                                         'must_be_logged_in' => true,
                                         'block_self'        => true,
-                                        'wrapper_class'     => 'friendship-button pending',
+                                        'wrapper_class'     => 'friendship-button pending_friend',
                                         'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
-                                        'link_href'         => trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests' ),
-                                        'link_text'         => __( 'Friendship Requested', 'buddypress' ),
-                                        'link_title'        => __( 'Friendship Requested', 'buddypress' ),
-                                        'link_class'        => 'friendship-button pending requested'
+                                        'link_href'         => wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . $potential_friend_id . '/', 'friends_withdraw_friendship' ),
+                                        'link_text'         => __( 'Cancel Friendship Request', 'buddypress' ),
+                                        'link_title'        => __( 'Cancel Friendship Requested', 'buddypress' ),
+                                        'link_id'                       => 'friend-' . $potential_friend_id,
+                                        'link_rel'                      => 'remove',
+                                        'link_class'        => 'friendship-button pending_friend requested'
                                 );
                                 break;

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -526 +526 @@
                         echo __("Friendship could not be requested.", 'buddypress');
                 } else {
-                        echo '<a href="' . bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests" class="requested">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
+                        echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Cancel Friendship Request', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . (int)$_POST['fid'] . '/', 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
+                }
+        } else if( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), (int)$_POST['fid'] ) ) {
+                
+                check_ajax_referer('friends_withdraw_friendship');
+                
+                if ( friends_withdraw_friendship( bp_loggedin_user_id(), (int)$_POST['fid'] ) ) {
+                        echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $_POST['fid'], 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+                } else {
+                        echo __("Friendship request could not be cancelled.", 'buddypress');
                 }
         } else {

trunk/bp-themes/bp-default/_inc/global.js

@@ -918 +918 @@
                                                 parentdiv.removeClass('add_friend');
                                                 parentdiv.removeClass('loading');
-                                                parentdiv.addClass('pending');
+                                                parentdiv.addClass('pending_friend');
                                                 parentdiv.fadeIn(200).html(response);
                                         }