<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5931] trunk: Add the ability to cancel a pending friendship request.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5931">5931</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-03-16 02:57:03 +0000 (Fri, 16 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the ability to cancel a pending friendship request. Props ddean. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3897">#3897</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpfriendsbpfriendsclassesphp">trunk/bp-friends/bp-friends-classes.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsfunctionsphp">trunk/bp-friends/bp-friends-functions.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsscreensphp">trunk/bp-friends/bp-friends-screens.php</a></li>
<li><a href="#trunkbpfriendsbpfriendstemplatephp">trunk/bp-friends/bp-friends-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpfriendsbpfriendsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-classes.php (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-classes.php 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-friends/bp-friends-classes.php 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -207,6 +207,12 @@
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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() ) );
+ }
+
</ins><span class="cx"> public static function reject($friendship_id) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-functions.php (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-functions.php 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-friends/bp-friends-functions.php 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -139,6 +139,23 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+ }
+
+ return false;
+}
+
</ins><span class="cx"> function friends_check_friendship( $user_id, $possible_friend_id ) {
</span><span class="cx">
</span><span class="cx"> if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-screens.php (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-screens.php 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-friends/bp-friends-screens.php 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -47,6 +47,17 @@
</span><span class="cx"> bp_core_add_message( __( 'Friendship could not be rejected', 'buddypress' ), 'error' );
</span><span class="cx">
</span><span class="cx"> bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_current_component() . '/' . bp_current_action() ) );
</span><ins>+
+ } 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() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'friends_screen_requests' );
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-template.php (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-template.php 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-friends/bp-friends-template.php 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -318,12 +318,14 @@
</span><span class="cx"> 'component' => 'friends',
</span><span class="cx"> 'must_be_logged_in' => true,
</span><span class="cx"> 'block_self' => true,
</span><del>- 'wrapper_class' => 'friendship-button pending',
</del><ins>+ 'wrapper_class' => 'friendship-button pending_friend',
</ins><span class="cx"> 'wrapper_id' => 'friendship-button-' . $potential_friend_id,
</span><del>- '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'
</del><ins>+ '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'
</ins><span class="cx"> );
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -525,8 +525,17 @@
</span><span class="cx"> if ( !friends_add_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
</span><span class="cx"> echo __("Friendship could not be requested.", 'buddypress');
</span><span class="cx"> } else {
</span><del>- echo '<a href="' . bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests" class="requested">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
</del><ins>+ 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>';
</ins><span class="cx"> }
</span><ins>+ } 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');
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> echo __( 'Request Pending', 'buddypress' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (5930 => 5931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2012-03-16 02:46:06 UTC (rev 5930)
+++ trunk/bp-themes/bp-default/_inc/global.js 2012-03-16 02:57:03 UTC (rev 5931)
</span><span class="lines">@@ -917,7 +917,7 @@
</span><span class="cx"> function() {
</span><span class="cx"> parentdiv.removeClass('add_friend');
</span><span class="cx"> parentdiv.removeClass('loading');
</span><del>- parentdiv.addClass('pending');
</del><ins>+ parentdiv.addClass('pending_friend');
</ins><span class="cx"> parentdiv.fadeIn(200).html(response);
</span><span class="cx"> }
</span><span class="cx"> );
</span></span></pre>
</div>
</div>
</body>
</html>