<!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>[10595] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php: Support Forums: When automatically adding a "Forum role changed to.." user note, append it to the last note added if it's from the current user in the last 5 minutes.</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://meta.trac.wordpress.org/changeset/10595">10595</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10595","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-01-19 04:40:47 +0000 (Tue, 19 Jan 2021)</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'>Support Forums: When automatically adding a "Forum role changed to.." user note, append it to the last note added if it's from the current user in the last 5 minutes.
This allows for a note added while blocking/unblocking a user to contain both the moderator note and the action performed.
See <a href="http://meta.trac.wordpress.org/ticket/4192">#4192</a>.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4691">#4691</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2021-01-19 04:38:56 UTC (rev 10594)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2021-01-19 04:40:47 UTC (rev 10595)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,6 +1300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blocked_prefix = 'BLOCKED' . substr( wp_hash( 'bb_break_password' ), 0, 13 ) . '---';
</span><span class="cx" style="display: block; padding: 0 10px"> $blocked_role = bbp_get_blocked_role();
</span><span class="cx" style="display: block; padding: 0 10px"> $password_broken = ( 0 === strpos( $user->user_pass, $blocked_prefix ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note_text = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $blocked_role === $new_role && ! $password_broken ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // User has been blocked, break their password and sessions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,12 +1322,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->destroy_all();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a user note about this action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Plugin::get_instance()->user_notes->add_user_note(
- $user->ID,
- sprintf(
- 'Forum role changed to %s.',
- get_role( $new_role )->name
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note_text = sprintf(
+ 'Forum role changed to %s.',
+ get_role( $new_role )->name
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if (
</span><span class="cx" style="display: block; padding: 0 10px"> $password_broken &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1347,12 +1345,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clean_user_cache( $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a user note about this action.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note_text = sprintf(
+ 'Forum role changed to %s.',
+ get_role( $new_role )->name
+ );
+ }
+
+ if ( $note_text ) {
+ // Add a user note about this action.
+ $notes = Plugin::get_instance()->user_notes->get_user_notes( $user->ID );
+ $note_id = 0;
+
+ // Check to see if the last note added was from the current user in the last few minutes, and if so, append to it.
+ if ( $notes->count ) {
+ $last_note_id = array_key_last( $notes->raw );
+ $last_note = $notes->raw[ $last_note_id ];
+ if (
+ // Note from the current user
+ $last_note->moderator === wp_get_current_user()->user_nicename &&
+ // ..and created within 5 minutes.
+ absint( time() - strtotime( $last_note->date ) ) <= 5 * MINUTE_IN_SECONDS
+ ) {
+ $note_id = $last_note_id;
+
+ // Prefix the existing message.
+ $note_text = trim( $last_note->text . "\n\n" . $note_text );
+ }
+ }
+
+ // Add a user note about this action.
</ins><span class="cx" style="display: block; padding: 0 10px"> Plugin::get_instance()->user_notes->add_user_note(
</span><span class="cx" style="display: block; padding: 0 10px"> $user->ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf(
- 'Forum role changed to %s.',
- get_role( $new_role )->name
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note_text,
+ null,
+ $note_id
</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>
</div>
</body>
</html>