<!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>[11364] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php: SVN Watcher: Fix some bugs in the reports.</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/11364">11364</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/11364","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-12-13 08:34:37 +0000 (Mon, 13 Dec 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'>SVN Watcher: Fix some bugs in the reports.
See <a href="http://meta.trac.wordpress.org/ticket/5978">#5978</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminreportspagephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcheradminreportspagephp"></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/wporg-trac-watcher/admin/reports-page.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/wporg-trac-watcher/admin/reports-page.php 2021-12-13 07:06:14 UTC (rev 11363)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php 2021-12-13 08:34:37 UTC (rev 11364)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,14 +181,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'versions-contributed':
</span><span class="cx" style="display: block; padding: 0 10px"> $details = $wpdb->get_results(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT prop_name, user_id, COUNT(*) as count, group_concat( version ORDER BY version ASC SEPARATOR ', ' ) as versions FROM (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT prop_name, user_id, COUNT( distinct version ) as count,
+ group_concat( distinct version ORDER BY version ASC SEPARATOR ', ' ) as versions,
+ ifnull(user_id,prop_name) as _groupby
+ FROM (
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT distinct LEFT(version, 3) as version, prop_name, p.user_id
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$details['props_table']} p
</span><span class="cx" style="display: block; padding: 0 10px"> JOIN {$details['rev_table']} r ON p.revision = r.id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- group by prop_name, version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GROUP BY prop_name, version
+ UNION
+ SELECT distinct LEFT(version, 3) as version, r.author as prop_name, u.ID as user_id
+ FROM {$details['rev_table']} r
+ JOIN {$wpdb->users} u ON r.author = u.user_login
+ GROUP BY r.author, version
</ins><span class="cx" style="display: block; padding: 0 10px"> ) a
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- group by prop_name HAVING COUNT(*) > 2
- ORDER BY COUNT(*) DESC"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WHERE version != ''
+ group by _groupby HAVING COUNT(*) > 1
+ ORDER BY `count` DESC"
</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"> echo '<table class="widefat striped">';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,13 +218,16 @@
</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"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<tr><td>%s</td><td>%s</td><td>%s</td></tr>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<tr><td>%s</td><td>%s</td><td title="%s">%s</td></tr>',
</ins><span class="cx" style="display: block; padding: 0 10px"> $profile,
</span><span class="cx" style="display: block; padding: 0 10px"> $p->count,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( $p->versions ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $p->versions
</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"> echo '</table>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'typos':
</span><span class="cx" style="display: block; padding: 0 10px"> $details = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT u.user_login, u.user_nicename,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,26 +269,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'raw-contributors-and-committers':
</span><span class="cx" style="display: block; padding: 0 10px"> $details = $wpdb->get_results(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT p.prop_name, u.user_nicename, u.display_name, u.ID,
- IFNULL(p.user_id,p.prop_name) as _groupby
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT prop_name, ID, user_nicename, display_name, _groupby, SUM(_count) as count FROM (
+ SELECT p.prop_name, u.ID, u.user_nicename, u.display_name,
+ IFNULL(p.user_id,p.prop_name) as _groupby, COUNT(*) as _count
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM {$details['props_table']} p
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$details['rev_table']} r ON p.revision = r.id
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$wpdb->users} u ON p.user_id = u.ID
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WHERE $where
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WHERE $where AND p.prop_name != r.author
</ins><span class="cx" style="display: block; padding: 0 10px"> GROUP BY _groupby
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- UNION
- SELECT r.author as prop_name, u.user_nicename, u.display_name, u.ID, u.ID as _groupby
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ UNION
+
+ SELECT r.author as prop_name, u.ID, u.user_nicename, u.display_name,
+ u.ID as _groupby, COUNT(*) as _count
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM {$details['rev_table']} r
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$wpdb->users} u ON r.author = u.user_login
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE $where
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY prop_name ASC"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GROUP BY _groupby
+ ) results
+ GROUP BY _groupby
+ ORDER BY count DESC"
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<p>Props (Contributors + Committers bunched together) designed to be copy-pasted elsewhere. Set gravatar size via adding <a href='$url&size=96'>&size=96</a> to this URL.</p>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<p>Props (Contributors + Committers bunched together) designed to be copy-pasted elsewhere.<br>
+ Set gravatar size via adding <a href='$url&size=96'>&size=96</a> to this URL.<br>
+ Note: A committer prop'ing themselves only counts for 1 here.</p>";
</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">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<thead><tr><th>ID</th><th>Name</th><th>DisplayName</th><th>Profile URL</th><th>Gravatar</th><th>GravURL</th></tr></thead>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<thead><tr><th>ID</th><th>Name</th><th>DisplayName</th><th>Count</th><th>Profile URL</th><th>Gravatar</th><th>GravURL</th></tr></thead>';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $details as $c ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,10 +307,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'admin.php' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
</ins><span class="cx" style="display: block; padding: 0 10px"> $c->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> $c->prop_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $c->display_name,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c->count,
</ins><span class="cx" style="display: block; padding: 0 10px"> make_clickable( $c->user_nicename ? 'https://profile.wordpress.org/' . $c->user_nicename . '/' : '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $c->ID ? get_avatar( $c->ID, min( 96, $_GET['size'] ?? 32 ) ) : '',
</span><span class="cx" style="display: block; padding: 0 10px"> make_clickable( $c->ID ? get_avatar_url( $c->ID, [ 'size' => $_GET['size'] ?? 64 ] ) : '' )
</span></span></pre>
</div>
</div>
</body>
</html>