<!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>[5650] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php: Support Forums, User Notes: Limit note editing and deletion:</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://meta.trac.wordpress.org/changeset/5650">5650</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/5650","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-11 21:05:57 +0000 (Tue, 11 Jul 2017)</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, User Notes: Limit note editing and deletion:
* Only keymasters or the note author can edit a note.
* Only keymasters can delete a note.
See <a href="http://meta.trac.wordpress.org/ticket/2272">#2272</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassusernotesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassusernotesphp"></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-user-notes.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-user-notes.php 2017-07-11 19:54:20 UTC (rev 5649)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php 2017-07-11 21:05:57 UTC (rev 5650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,17 +5,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class User_Notes {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * An array of authors who have written notes.
- *
- * These are stored to avoid looking up user IDs for every note.
- *
- * @access private
- *
- * @var array $moderators
- */
- private $moderators = array();
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * An array of all notes for each user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * As users may have written multiple replies in a thread, this will help us
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,6 +92,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderator' => wp_get_current_user()->user_nicename
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only keymasters or the note author can edit a note.
+ if (
+ ! current_user_can( 'keep_gate' )
+ &&
+ $user_notes[ $note_id ]->moderator !== wp_get_current_user()->user_nicename
+ ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Save new text for an existing note.
</span><span class="cx" style="display: block; padding: 0 10px"> $user_notes[ $note_id ]->text = $note_text;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action Requested action.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function delete_user_note( $action = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wporg_bbp_delete_user_note' !== $action || ! current_user_can( 'moderate' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wporg_bbp_delete_user_note' !== $action || ! current_user_can( 'keep_gate' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,12 +256,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_post_type = get_post_type();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_notes as $key => $note ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $moderator = $note->moderator;
-
- if ( ! isset( $this->moderators[ $moderator ] ) ) {
- $this->moderators[ $moderator ] = $moderator;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $post_site_id = isset( $note->site_id ) ? (int) $note->site_id : get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_permalink = $this->get_user_note_post_permalink( $note->post_id, $user_id, $post_site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_on_delete = $this->get_user_note_post_permalink( get_the_ID(), $user_id, get_current_blog_id() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: user note author's display name, 2: link to post, 3: date, 4: time */
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => sprintf( __( 'By %1$s on <a href="%2$s">%3$s at %4$s</a>', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%s">%s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( get_home_url( $post_site_id, "/users/$moderator/" ) ),
- $moderator
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( get_home_url( $post_site_id, "/users/{$note->moderator}/" ) ),
+ $note->moderator
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $post_permalink ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: localized date format, see https://secure.php.net/date */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,8 +275,12 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_site_id == get_current_blog_id() ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only keymasters or the note author can edit a note.
+ if (
+ current_user_can( 'keep_gate' ) && $post_site_id == get_current_blog_id()
+ ||
+ $note->moderator === wp_get_current_user()->user_nicename
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $note_meta['edit'] = sprintf( '<a href="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +291,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Edit', 'wporg-forums' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only keymasters can delete a note.
+ if ( current_user_can( 'keep_gate' ) && $post_site_id == get_current_blog_id() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $note_meta['delete'] = sprintf( '<a href="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_nonce_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +306,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Delete', 'wporg-forums' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> printf( '<div class="bbp-template-notice warning"><p>%s</p> %s</div>' . "\n",
</span></span></pre>
</div>
</div>
</body>
</html>