<!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][10286] trunk: Messages: Return context-appropriate error messages for `messages_new_message()`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10286">10286</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10286","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-19 19:47:01 +0000 (Mon, 19 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Messages: Return context-appropriate error messages for `messages_new_message()`.
This commit introduces the `error_type` parameter in the
`messages_new_message()` function, which allows for us to return
descriptive error messages to the user when `'error_type'` is set to
`'wp_error'`.
This most notably addresses an issue when entering an invalid username
when composing a new private message.
Commit also includes a unit test.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6535">#6535</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesbpmessagesactionsphp">trunk/src/bp-messages/bp-messages-actions.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagesfunctionsphp">trunk/src/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesmessagesfunctionsphp">trunk/tests/phpunit/testcases/messages/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesbpmessagesactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-actions.php 2015-10-17 18:16:35 UTC (rev 10285)
+++ trunk/src/bp-messages/bp-messages-actions.php 2015-10-19 19:47:01 UTC (rev 10286)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,23 +84,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $recipients = apply_filters( 'bp_messages_recipients', $recipients );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to send the message
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thread_id = messages_new_message( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send = messages_new_message( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'recipients' => $recipients,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subject' => $_POST['subject'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => $_POST['content']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $_POST['content'],
+ 'error_type' => 'wp_error'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send the message and redirect to it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $thread_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === is_int( $send ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $success = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $feedback = __( 'Message successfully sent.', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> $view = trailingslashit( $member_messages . 'view' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_to = trailingslashit( $view . $thread_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = trailingslashit( $view . $send );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Message could not be sent
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $success = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $feedback = __( 'Message was not sent. Please try again.', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $feedback = $send->get_error_message();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-functions.php 2015-10-17 18:16:35 UTC (rev 10285)
+++ trunk/src/bp-messages/bp-messages-functions.php 2015-10-19 19:47:01 UTC (rev 10286)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Create a new message.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.4.0 Added 'error_type' as an additional $args parameter.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $sender_id Optional. ID of the user who is sending the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * threads, 'No Subject' will be used if no $subject is provided.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $content Content of the message. Cannot be empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $date_sent Date sent, in 'Y-m-d H:i:s' format. Default: current date/time.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $error_type Optional. Error type. Either 'bool' or 'wp_error'. Default: 'bool'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|bool ID of the message thread on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,12 +46,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'recipients' => array(), // Can be an array of usernames, user_ids or mixed.
</span><span class="cx" style="display: block; padding: 0 10px"> 'subject' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date_sent' => bp_core_current_time()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date_sent' => bp_core_current_time(),
+ 'error_type' => 'bool'
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'messages_new_message' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if no sender or no content
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['sender_id'] ) || empty( $r['content'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp_error' === $r['error_type'] ) {
+ if ( empty( $r['sender_id'] ) ) {
+ $error_code = 'messages_empty_sender';
+ $feedback = __( 'Your message was not sent. Please use a valid sender.', 'buddypress' );
+ } else {
+ $error_code = 'messages_empty_content';
+ $feedback = __( 'Your message was not sent. Please enter some content.', 'buddypress' );
+ }
+
+ return new WP_Error( $error_code, $feedback );
+
+ } else {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a new message object
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +99,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if no recipients
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['recipients'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp_error' === $r['error_type'] ) {
+ return new WP_Error( 'message_empty_recipients', __( 'Message could not be sent. Please enter a recipient.', 'buddypress' ) );
+ } else {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set a default subject if none exists
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +159,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove duplicates & bail if no recipients
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_ids = array_unique( $recipient_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $recipient_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp_error' === $r['error_type'] ) {
+ return new WP_Error( 'message_invalid_recipients', __( 'Message could not be sent because you have entered an invalid username. Please try again.', 'buddypress' ) );
+ } else {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Format this to match existing recipients
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/messages/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/messages/functions.php 2015-10-17 18:16:35 UTC (rev 10285)
+++ trunk/tests/phpunit/testcases/messages/functions.php 2015-10-19 19:47:01 UTC (rev 10286)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,4 +41,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, messages_get_unread_count( $u2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @group messages_new_message
+ */
+ public function test_messages_new_message_invalid_recipient_error_message() {
+ $u1 = $this->factory->user->create();
+
+ // attempt to send a private message to an invalid username
+ $t1 = messages_new_message( array(
+ 'sender_id' => $u1,
+ 'recipients' => array( 'homerglumpkin' ),
+ 'subject' => 'A new message',
+ 'content' => 'Hey there!',
+ 'error_type' => 'wp_error'
+ ) );
+
+ $this->assertSame( 'Message could not be sent because you have entered an invalid username. Please try again.', $t1->get_error_message() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>