Changeset 7462 for trunk/bp-messages/bp-messages-functions.php

Timestamp:

10/23/2013 07:22:17 AM (12 years ago)

Author:

r-a-y

Message:

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:

1. A site uses numeric user_login / user_nicenames only; and if
2. 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 #5151.

Props DennisSmolek.

File:

• trunk/bp-messages/bp-messages-functions.php (modified) (1 diff)

trunk/bp-messages/bp-messages-functions.php

@@ -75 +75 @@
             $recipient_id = false;
 
-            // input was numeric
-            if ( is_numeric( $recipient ) ) {
-                // do a check against the user ID column first
-                if ( bp_core_get_core_userdata( (int) $recipient ) )
+            // 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 ) ) {
                     $recipient_id = (int) $recipient;
-
-                // 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 );
                 }
-
+            }
+
+            if ( ! $recipient_id ) {
+                $invalid_recipients[] = $recipient;
             } else {
-                if ( bp_is_username_compatibility_mode() )
-                    $recipient_id = bp_core_get_userid( $recipient );
-                else
-                    $recipient_id = bp_core_get_userid_from_nicename( $recipient );
-            }
-
-            if ( !$recipient_id )
-                $invalid_recipients[] = $recipient;
-            else
                 $recipient_ids[] = (int) $recipient_id;
+            }
         }