<!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>[4728] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Add stat recording for downloads to bump the plugin download counts.</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/4728">4728</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/4728","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>2017-01-19 06:48:03 +0000 (Thu, 19 Jan 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'>Plugin Directory: Add stat recording for downloads to bump the plugin download counts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassmetasyncphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-meta-sync.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryzipclassservephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-serve.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassmetasyncphp"></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/jobs/class-meta-sync.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/jobs/class-meta-sync.php 2017-01-19 04:33:23 UTC (rev 4727)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-meta-sync.php 2017-01-19 06:48:03 UTC (rev 4728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,13 +33,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $download_count_table = PLUGINS_TABLE_PREFIX . 'download_counts';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bbpress_topic_slug_table = PLUGINS_TABLE_PREFIX . 'topics';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $changed_download_counts = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT p.id as post_id, downloads
</span><span class="cx" style="display: block; padding: 0 10px"> FROM `{$wpdb->posts}` p
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- JOIN `{$bbpress_topic_slug_table}` t ON p.post_name = t.topic_slug
- JOIN `{$download_count_table}` c on t.topic_id = c.topic_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ JOIN `{$download_count_table}` c on p.post_name = c.plugin_slug
</ins><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN `{$wpdb->postmeta}` pm ON p.id = pm.post_id AND pm.meta_key = 'downloads'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryzipclassservephp"></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/zip/class-serve.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/zip/class-serve.php 2017-01-19 04:33:23 UTC (rev 4727)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-serve.php 2017-01-19 06:48:03 UTC (rev 4728)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,16 +178,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function record_stats( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stats = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stats_dedup_log_table = PLUGINS_TABLE_PREFIX . 'downloads';
+ $stats_download_table = PLUGINS_TABLE_PREFIX . 'download_counts';
+ $stats_download_daily_table = PLUGINS_TABLE_PREFIX . 'stats';
+
+ // Very basic de-duplication for downloads.
+ $recent = $wpdb->get_var( $wpdb->prepare(
+ "SELECT `client_ip`
+ FROM {$stats_dedup_log_table}
+ WHERE
+ plugin_slug = %s AND
+ client_ip = %s AND
+ user_agent = %s AND
+ stamp BETWEEN %s AND %s
+ LIMIT 1",
+ $request['slug'],
+ $_SERVER['REMOTE_ADDR'],
+ $_SERVER['HTTP_USER_AGENT'],
+ gmdate( 'Y-m-d 00:00:00' ),
+ gmdate( 'Y-m-d 23:59:59' )
+ ) );
+
+ if ( $recent ) {
+ return;
+ }
+
+ $wpdb->query( $wpdb->prepare(
+ "INSERT INTO {$stats_download_table} (`plugin_slug`, `downloads`) VALUES ( %s, 1 ) ON DUPLICATE KEY UPDATE `downloads` = `downloads` + 1",
+ $stats['plugin_slug']
+ ) );
+
+ $wpdb->query( $wpdb->prepare(
+ "INSERT INTO {$stats_download_daily_table} (`plugin_slug`, `stamp`, `downloads`) VALUES ( %s, %s, 1 ) ON DUPLICATE KEY UPDATE `downloads` = `downloads` + 1",
+ $stats['plugin_slug'],
+ gmdate( 'Y-m-d' )
+ ) );
+
+ $wpdb->insert( $stats_dedup_log_table, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_slug' => $request['slug'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'client_ip' => $_SERVER['REMOTE_ADDR'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'client_host' => gethostbyaddr( $_SERVER['REMOTE_ADDR'] ),
- 'user_agent' => $_SERVER['HTTP_USER_AGENT']
- );
- // $wpdb->insert( stats_table, $stats );
- // TODO: This is stored in bbPress tables still.
- // $post_id = $this->get_post_id( $request['slug'] );
- // $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->postmeta SET meta_value = meta_value + 1 WHERE post_id = %d AND meta_key = 'downloads'", $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_agent' => $_SERVER['HTTP_USER_AGENT'],
+ 'stamp' => gmdate( 'Y-m-d H:i:s' )
+ ) );
+
</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>