<!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][12402] branches/4.0: Make sure Messages exports only include the ones sent by the user</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 { white-space: pre-line; 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/12402">12402</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/12402","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-06-17 17:41:01 +0000 (Mon, 17 Jun 2019)</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'>Make sure Messages exports only include the ones sent by the user
Using the {{{$user->ID}}} instead of the {{{$recipients->ID}}} to check for the sender ID is more reliable to make sure the generated zip Archive only contains messages sent by the requesting user.
Props gingerbooch, Venutius
See <a href="http://buddypress.trac.wordpress.org/ticket/8080">#8080</a> (branch 4.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40srcbpmessagesbpmessagesfunctionsphp">branches/4.0/src/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#branches40testsphpunittestcasesmessagesfunctionsphp">branches/4.0/tests/phpunit/testcases/messages/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches40srcbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/bp-messages/bp-messages-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/bp-messages/bp-messages-functions.php 2019-05-25 14:30:01 UTC (rev 12401)
+++ branches/4.0/src/bp-messages/bp-messages-functions.php 2019-06-17 17:41:01 UTC (rev 12402)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $thread->messages as $message_index => $message ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only include messages written by the user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $recipient->user_id !== $message->sender_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user->ID !== $message->sender_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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="branches40testsphpunittestcasesmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/testcases/messages/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/testcases/messages/functions.php 2019-05-25 14:30:01 UTC (rev 12401)
+++ branches/4.0/tests/phpunit/testcases/messages/functions.php 2019-06-17 17:41:01 UTC (rev 12402)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,4 +152,62 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Number of exported messages.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, count( $actual['data'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket BP8080
+ */
+ public function test_bp_messages_personal_data_exporter_check_sender() {
+ $u1 = self::factory()->user->create();
+ $u2 = self::factory()->user->create();
+ $expected = array(
+ 'Hey u2!',
+ 'You could have replied to my first message u2!',
+ );
+
+ $time = time();
+
+ $t1 = messages_new_message( array(
+ 'sender_id' => $u1,
+ 'recipients' => array( $u2 ),
+ 'subject' => 'A new message',
+ 'content' => $expected[0],
+ 'date_sent' => date( 'Y-m-d H:i:s', $time - ( 3 * HOUR_IN_SECONDS ) ),
+ ) );
+
+ $t2 = messages_new_message( array(
+ 'sender_id' => $u2,
+ 'recipients' => array( $u1 ),
+ 'subject' => 'A new message',
+ 'content' => 'Hey u1!',
+ 'date_sent' => date( 'Y-m-d H:i:s', $time - ( 5 * HOUR_IN_SECONDS ) ),
+ ) );
+
+ $t3 = messages_new_message( array(
+ 'sender_id' => $u1,
+ 'thread_id' => $t2,
+ 'recipients' => array( $u2 ),
+ 'subject' => 'Reply to ' . $t2,
+ 'content' => $expected[1],
+ 'date_sent' => date( 'Y-m-d H:i:s', $time - ( 4 * HOUR_IN_SECONDS ) ),
+ ) );
+
+ $test_user = new WP_User( $u1 );
+
+ $threads = bp_messages_personal_data_exporter( $test_user->user_email, 1 );
+ $threads_data = wp_list_pluck( $threads['data'], 'data' );
+ $actual = array();
+
+ foreach ( $threads_data as $thread ) {
+ foreach ( $thread as $data ) {
+ if ( 'Message Content' !== $data['name'] ) {
+ continue;
+ }
+
+ $actual[] = $data['value'];
+ }
+ }
+
+ // Only messages sent by u1 should be exported.
+ $this->assertEquals( $expected, $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>