<!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>[9682] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Add audit log entries for plugin committer/support reps addition/removal.</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/9682">9682</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/9682","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>2020-04-02 02:23:28 +0000 (Thu, 02 Apr 2020)</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'>Plugin Directory: Add audit log entries for plugin committer/support reps addition/removal.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2717">#2717</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassinternalnotesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-internal-notes.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselfclosephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstoolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp"></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/plugin-directory/admin/class-status-transitions.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/plugin-directory/admin/class-status-transitions.php 2020-04-02 01:54:33 UTC (rev 9681)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php 2020-04-02 02:23:28 UTC (rev 9682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_name
</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">- $this->audit_log( 'Plugin approved.', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log( 'Plugin approved.', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $plugin_author->user_email, $subject, $content, 'From: plugins@wordpress.org' );
</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">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugins@wordpress.org'
</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">- $this->audit_log( 'Plugin rejected.', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log( 'Plugin rejected.', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $email, $subject, $content, 'From: plugins@wordpress.org' );
</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">@@ -361,7 +361,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post && 'approved' != $post->post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->audit_log( 'Plugin reopened.', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log( 'Plugin reopened.', $post_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_close_reason', $close_reason );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, 'plugin_closed_date', current_time( 'mysql' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->audit_log( sprintf( 'Plugin closed. Reason: %s', $close_reason ), $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log( sprintf( 'Plugin closed. Reason: %s', $close_reason ), $post_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,31 +405,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_owner = get_userdata( $post_after->post_author );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->audit_log( sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log( sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Ownership transferred to <a href="%s">%s</a>.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( '//profiles.wordpress.org/' . $new_owner->user_nicename ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( 'https://profiles.wordpress.org/' . $new_owner->user_nicename .'/' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_owner->user_login
</span><span class="cx" style="display: block; padding: 0 10px"> ), $post_id );
</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">- /**
- * Saves an audit_log comment for the plugin.
- *
- * @param string $message The message for the audit log.
- * @param integer $post_id The Post ID.
- */
- public function audit_log( $message, $post_id ) {
- $user = wp_get_current_user();
-
- $comment = array(
- 'comment_author' => $user->display_name,
- 'comment_author_email' => $user->user_email,
- 'comment_author_url' => $user->user_url,
- 'comment_type' => 'internal-note',
- 'comment_post_ID' => $post_id,
- 'user_id' => get_current_user_id(),
- 'comment_content' => $message,
- );
- wp_insert_comment( $comment );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassinternalnotesphp"></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/plugin-directory/admin/metabox/class-internal-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/plugin-directory/admin/metabox/class-internal-notes.php 2020-04-02 01:54:33 UTC (rev 9681)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-internal-notes.php 2020-04-02 02:23:28 UTC (rev 9682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action Action to perform.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_notes( $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_notes( $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $action ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'get-comments';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginselfclosephp"></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/plugin-directory/api/routes/class-plugin-self-close.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/plugin-directory/api/routes/class-plugin-self-close.php 2020-04-02 01:54:33 UTC (rev 9681)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php 2020-04-02 02:23:28 UTC (rev 9682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,16 +73,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'plugin_closed_date', current_time( 'mysql' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add an audit-log entry as to why this has happened.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_get_current_user();
- wp_insert_comment( [
- 'comment_author' => $user->display_name,
- 'comment_author_email' => $user->user_email,
- 'comment_author_url' => $user->user_url,
- 'comment_type' => 'internal-note',
- 'comment_post_ID' => $plugin->ID,
- 'user_id' => get_current_user_id(),
- 'comment_content' => sprintf( 'Plugin closed. Reason: Author Self-close Request from %s', $_SERVER['REMOTE_ADDR'] ),
- ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log(
+ $plugin,
+ sprintf( 'Plugin closed. Reason: Author Self-close Request from %s', $_SERVER['REMOTE_ADDR'] )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Email all Plugin Committers.
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[WordPress Plugin Directory] %s has been closed', 'wporg-plugins' ), $plugin->post_title );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstoolsphp"></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/plugin-directory/class-tools.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/plugin-directory/class-tools.php 2020-04-02 01:54:33 UTC (rev 9681)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php 2020-04-02 02:23:28 UTC (rev 9682)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +196,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $user->user_login, 'committer-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> Tools::sync_plugin_committers_with_taxonomy( $plugin_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log(
+ sprintf(
+ 'Added <a href="%s">%s</a> as a committer.',
+ esc_url( 'https://profiles.wordpress.org/' . $user->user_nicename . '/' ),
+ $user->user_login
+ ),
+ $plugin_slug
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -229,6 +238,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $user->user_login, 'committer-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> Tools::sync_plugin_committers_with_taxonomy( $plugin_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log(
+ sprintf(
+ 'Removed <a href="%s">%s</a> as a committer.',
+ esc_url( 'https://profiles.wordpress.org/' . $user->user_nicename . '/' ),
+ $user->user_login
+ ),
+ $plugin_slug
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -325,6 +343,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $plugin_slug, 'plugin-support-reps' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $user->user_nicename, 'support-rep-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log(
+ sprintf(
+ 'Added <a href="%s">%s</a> as a support rep.',
+ esc_url( 'https://profiles.wordpress.org/' . $user->user_nicename . '/' ),
+ $user->user_login
+ ),
+ $plugin_slug
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -357,6 +384,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $plugin_slug, 'plugin-support-reps' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $user->user_nicename, 'support-rep-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Tools::audit_log(
+ sprintf(
+ 'Removed <a href="%s">%s</a> as a support rep.',
+ esc_url( 'https://profiles.wordpress.org/' . $user->user_nicename . '/' ),
+ $user->user_login
+ ),
+ $plugin_slug
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -556,4 +592,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_object_cache->memcache_debug = [];
</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">+
+ /**
+ * Add an Audit Internal Note for a plugin.
+ *
+ * @param int|string|WP_Post $plugin A Post ID, Plugin Slug or, WP_Post object.
+ * @param string $note The note to audit log entry to add.
+ * @param WP_User $user The user which performed the action. Optional.
+ */
+ public static function audit_log( $note, $plugin = null, $user = false ) {
+ if ( is_string( $plugin ) && ! is_numeric( $plugin ) ) {
+ $plugin = Plugin_Directory::get_plugin_post( $plugin );
+ } else {
+ $plugin = get_post( $plugin );
+ }
+
+ if ( ! $note || ! $plugin ) {
+ return false;
+ }
+ if ( ! $user || ! ( $user instanceof \WP_User ) ) {
+ $user = wp_get_current_user();
+ }
+
+ return wp_insert_comment( [
+ 'comment_author' => $user->display_name,
+ 'comment_author_email' => $user->user_email,
+ 'comment_author_url' => $user->user_url,
+ 'comment_author_IP' => $_SERVER['REMOTE_ADDR'],
+ 'comment_type' => 'internal-note',
+ 'comment_post_ID' => $plugin->ID,
+ 'user_id' => $user->ID,
+ 'comment_content' => $note,
+ ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>