<!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>[13650] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Centralise the Helpscout email table query code.</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/13650">13650</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/13650","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>2024-05-02 07:05:00 +0000 (Thu, 02 May 2024)</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: Centralise the Helpscout email table query code.
See <a href="http://meta.trac.wordpress.org/ticket/7385">#7385</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasshelpscoutphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-helpscout.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreviewphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-review.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstoolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclasshelpscoutphp"></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-helpscout.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-helpscout.php 2024-05-02 06:47:34 UTC (rev 13649)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-helpscout.php 2024-05-02 07:05:00 UTC (rev 13650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,29 +14,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class HelpScout {
</span><span class="cx" style="display: block; padding: 0 10px"> public static function display() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Trim off the rejected prefix/suffix.
- $slug = preg_replace( '/(^rejected-|-rejected(-\d)?$)/i', '', $post->post_name );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If the slug is not set, we can't query HelpScout.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post->post_name || ! $slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $post->post_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo 'Invalid Slug, cannot query emails.';
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $emails = $wpdb->get_results( $wpdb->prepare(
- "SELECT emails.*
- FROM %i emails
- JOIN %i meta ON emails.id = meta.helpscout_id
- WHERE meta.meta_key = 'plugins' AND meta.meta_value IN( %s, %s )
- ORDER BY `created` DESC",
- "{$wpdb->base_prefix}helpscout",
- "{$wpdb->base_prefix}helpscout_meta",
- $slug,
- $post->post_name
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $emails = Tools::get_helpscout_emails( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<table class="widefat striped helpscout-emails">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>\n",
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" title="%s">%s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( 'https://secure.helpscout.net/conversation/' . $email->id . '/' . $email->number ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( $email->url ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $email->preview ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $subject )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreviewphp"></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-review.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-review.php 2024-05-02 06:47:34 UTC (rev 13649)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-review.php 2024-05-02 07:05:00 UTC (rev 13650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Plugin_Directory\API\Routes;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use WordPressdotorg\Plugin_Directory\Shortcodes\Upload_Handler;
</del><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\API\Base;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Template;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Tools;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WP_Error;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_REST_Server;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => $post->post_status,
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_url' => add_query_arg( [ 'action' => 'edit', 'post' => $post->ID ], admin_url( 'post.php' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'helpscout' => null, // Link to Review email (or most recent open email)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'helpscout' => null, // Most recent email details.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'submitter' => [
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $submitter->user_login,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => $submitter->user_email,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +105,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, [ 'new', 'pending', 'approved' ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $details['download_link'] = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $details['preview_link'] = null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details['helpscout'] = Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
+ } else {
+ $details['helpscout'] = Tools::get_helpscout_emails( $post, [ 'limit' => 1 ] );
</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"> $attachments = get_attached_media( 'application/zip', $post );
</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 2024-05-02 06:47:34 UTC (rev 13649)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php 2024-05-02 07:05:00 UTC (rev 13650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,4 +677,53 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return 200 === wp_remote_retrieve_response_code( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Fetch the list of known Helpscout emails for a given post.
+ *
+ * @param \WP_Post $post The post to fetch emails for.
+ * @return array
+ */
+ public static function get_helpscout_emails( $post, $filters = [] ) {
+ global $wpdb;
+
+ $limit = 999;
+ if ( isset( $filters['limit'] ) ) {
+ $limit = absint( $filters['limit'] );
+ unset( $filters['limit'] );
+ }
+
+ // Trim off the rejected prefix/suffix.
+ $slug = preg_replace( '/(^rejected-|-rejected(-\d)?$)/i', '', $post->post_name );
+ $wheres = '';
+
+ foreach ( $filters as $key => $value ) {
+ $wheres .= $wpdb->prepare( 'AND emails.%i LIKE %s ', $key, '%' . $value . '%' );
+ }
+
+ $emails = $wpdb->get_results( $wpdb->prepare(
+ "SELECT emails.*
+ FROM %i emails
+ JOIN %i meta ON emails.id = meta.helpscout_id
+ WHERE meta.meta_key = 'plugins' AND meta.meta_value IN( %s, %s )
+ $wheres
+ ORDER BY `created` DESC
+ LIMIT %d",
+ "{$wpdb->base_prefix}helpscout",
+ "{$wpdb->base_prefix}helpscout_meta",
+ $slug,
+ $post->post_name,
+ $limit
+ ) );
+
+ foreach ( $emails as &$email ) {
+ $email->url = 'https://secure.helpscout.net/conversation/' . $email->id . '/' . $email->number;
+ }
+
+ if ( 1 === $limit ) {
+ return reset( $emails );
+ }
+
+ return $emails;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></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/shortcodes/class-upload-handler.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/shortcodes/class-upload-handler.php 2024-05-02 06:47:34 UTC (rev 13649)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-05-02 07:05:00 UTC (rev 13650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,26 +737,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function find_review_email( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $post->post_status, [ 'new', 'pending' ] ) || ! $post->post_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // Find the latest email for this plugin that looks like a review email.
- return $wpdb->get_row( $wpdb->prepare(
- "SELECT emails.*
- FROM %i emails
- JOIN %i meta ON emails.id = meta.helpscout_id
- WHERE meta.meta_key = 'plugins' AND meta.meta_value = %s
- AND emails.subject LIKE %s
- ORDER BY `created` DESC
- LIMIT 1",
- "{$wpdb->base_prefix}helpscout",
- "{$wpdb->base_prefix}helpscout_meta",
- $post->post_name,
- '%Review in Progress:%' // The subject line of the review email.
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
</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>