<!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][7462] trunk/bp-messages/bp-messages-functions.php: Check username column first before sending a PM to a recipient.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/7462">7462</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2013-10-23 07:22:17 +0000 (Wed, 23 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check username column first before sending a PM to a recipient.
Previously, when sending a private message, a check was made against the
user ID column first to determine who the recipient is.
The problem with that is if:
a. A site uses numeric user_login / user_nicenames only; and if
b. A site has a large userbase
That the recipient might be calculated incorrectly because of the check
against the ID column first leading to unintended private messages being
sent to the wrong user(s).
This commit fixes this issue by reversing the look up so the user_login /
user_nicename DB column is checked first, followed by the ID column being
checked as a fallback if there is no initial match.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5151">#5151</a>.
Props DennisSmolek.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (7461 => 7462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2013-10-23 02:36:30 UTC (rev 7461)
+++ trunk/bp-messages/bp-messages-functions.php 2013-10-23 07:22:17 UTC (rev 7462)
</span><span class="lines">@@ -74,31 +74,26 @@
</span><span class="cx">
</span><span class="cx"> $recipient_id = false;
</span><span class="cx">
</span><del>- // input was numeric
- if ( is_numeric( $recipient ) ) {
- // do a check against the user ID column first
- if ( bp_core_get_core_userdata( (int) $recipient ) )
</del><ins>+ // check user_login / nicename columns first
+ // @see http://buddypress.trac.wordpress.org/ticket/5151
+ if ( bp_is_username_compatibility_mode() ) {
+ $recipient_id = bp_core_get_userid( $recipient );
+ } else {
+ $recipient_id = bp_core_get_userid_from_nicename( $recipient );
+ }
+
+ // check against user ID column if no match and if passed recipient is numeric
+ if ( ! $recipient_id && is_numeric( $recipient ) ) {
+ if ( bp_core_get_core_userdata( (int) $recipient ) ) {
</ins><span class="cx"> $recipient_id = (int) $recipient;
</span><del>-
- // if that fails, check against the user_login / user_nicename column
- else {
- if ( bp_is_username_compatibility_mode() )
- $recipient_id = bp_core_get_userid( (int) $recipient );
- else
- $recipient_id = bp_core_get_userid_from_nicename( (int) $recipient );
</del><span class="cx"> }
</span><del>-
- } else {
- if ( bp_is_username_compatibility_mode() )
- $recipient_id = bp_core_get_userid( $recipient );
- else
- $recipient_id = bp_core_get_userid_from_nicename( $recipient );
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$recipient_id )
</del><ins>+ if ( ! $recipient_id ) {
</ins><span class="cx"> $invalid_recipients[] = $recipient;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $recipient_ids[] = (int) $recipient_id;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Strip the sender from the recipient list if they exist
</span></span></pre>
</div>
</div>
</body>
</html>