<!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][6739] trunk: Better friend ID handling in ajax add/remove friend handler in bp-default and bp-legacy.</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/6739">6739</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-01-22 19:19:12 +0000 (Tue, 22 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better friend ID handling in ajax add/remove friend handler in bp-default and bp-legacy. Props Maty.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (6738 => 6739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-01-22 18:36:39 UTC (rev 6738)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-01-22 19:19:12 UTC (rev 6739)
</span><span class="lines">@@ -837,34 +837,45 @@
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> */
</span><span class="cx"> function bp_legacy_theme_ajax_addremove_friend() {
</span><ins>+
</ins><span class="cx"> // Bail if not a POST action
</span><span class="cx"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
</del><ins>+ // Cast fid as an integer
+ $friend_id = (int) $_POST['fid'];
+
+ // Trying to cancel friendship
+ if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_remove_friend' );
</span><span class="cx">
</span><del>- if ( ! friends_remove_friend( bp_loggedin_user_id(), $_POST['fid'] ) )
</del><ins>+ if ( ! friends_remove_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> echo __( 'Friendship could not be canceled.', 'buddypress' );
</span><del>- else
- 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>';
</del><ins>+ } else {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $friend_id, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+ }
</ins><span class="cx">
</span><del>- } elseif ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
</del><ins>+ // Trying to request friendship
+ } elseif ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_add_friend' );
</span><span class="cx">
</span><del>- if ( ! friends_add_friend( bp_loggedin_user_id(), $_POST['fid'] ) )
</del><ins>+ if ( ! friends_add_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> echo __(' Friendship could not be requested.', 'buddypress' );
</span><del>- else
- 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>';
</del><ins>+ } else {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="remove" rel="remove" title="' . __( 'Cancel Friendship Request', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . $friend_id . '/', 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
+ }
</ins><span class="cx">
</span><del>- } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), (int) $_POST['fid'] ) ) {
</del><ins>+ // Trying to cancel pending request
+ } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_withdraw_friendship' );
</span><span class="cx">
</span><del>- 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
</del><ins>+ if ( friends_withdraw_friendship( bp_loggedin_user_id(), $friend_id ) ) {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $friend_id, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+ } else {
</ins><span class="cx"> echo __("Friendship request could not be cancelled.", 'buddypress');
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ // Request already pending
</ins><span class="cx"> } else {
</span><span class="cx"> echo __( 'Request Pending', 'buddypress' );
</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 (6738 => 6739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2013-01-22 18:36:39 UTC (rev 6738)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2013-01-22 19:19:12 UTC (rev 6739)
</span><span class="lines">@@ -594,30 +594,40 @@
</span><span class="cx"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
</del><ins>+ // Cast fid as an integer
+ $friend_id = (int) $_POST['fid'];
+
+ // Trying to cancel friendship
+ if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_remove_friend' );
</span><span class="cx">
</span><del>- if ( ! friends_remove_friend( bp_loggedin_user_id(), $_POST['fid'] ) )
</del><ins>+ if ( ! friends_remove_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> echo __( 'Friendship could not be canceled.', 'buddypress' );
</span><del>- else
- 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>';
</del><ins>+ } else {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $friend_id, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+ }
</ins><span class="cx">
</span><del>- } elseif ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
</del><ins>+ // Trying to request friendship
+ } elseif ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_add_friend' );
</span><span class="cx">
</span><del>- if ( ! friends_add_friend( bp_loggedin_user_id(), $_POST['fid'] ) )
</del><ins>+ if ( ! friends_add_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> echo __(' Friendship could not be requested.', 'buddypress' );
</span><del>- else
- 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>';
</del><ins>+ } else {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="remove" rel="remove" title="' . __( 'Cancel Friendship Request', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . $friend_id . '/', 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
+ }
</ins><span class="cx">
</span><del>- } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), (int) $_POST['fid'] ) ) {
</del><ins>+ // Trying to cancel pending request
+ } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
</ins><span class="cx"> check_ajax_referer( 'friends_withdraw_friendship' );
</span><span class="cx">
</span><del>- 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
</del><ins>+ if ( friends_withdraw_friendship( bp_loggedin_user_id(), $friend_id ) ) {
+ echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $friend_id, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+ } else {
</ins><span class="cx"> echo __("Friendship request could not be cancelled.", 'buddypress');
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ // Request already pending
</ins><span class="cx"> } else {
</span><span class="cx"> echo __( 'Request Pending', 'buddypress' );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>