<!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>[3327] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Move download stats to wp-admin.</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/3327">3327</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/3327","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-09 23:03:34 +0000 (Thu, 09 Jun 2016)</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: Move download stats to wp-admin.

Download stats are not terribly useful to users.

See <a href="http://meta.trac.wordpress.org/ticket/1596">#1596</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassstatsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-stats.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassstatsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-stats.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp"></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-customizations.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-customizations.php  2016-06-09 22:28:14 UTC (rev 3326)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php    2016-06-09 23:03:34 UTC (rev 3327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,6 +424,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                array( __NAMESPACE__ . '\Metabox\Committers', 'display' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                'plugin', 'side'
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       if ( current_user_can( 'plugin_add_committer', $post ) ) {
+                               add_meta_box(
+                                       'plugin-stats',
+                                       __( 'Plugin Stats', 'wporg-plugins' ),
+                                       array( __NAMESPACE__ . '\Metabox\Stats', 'display' ),
+                                       'plugin', 'normal'
+                               );
+                       }
</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">                // Remove unnecessary metaboxes.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassstatsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-stats.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-stats.php                           (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-stats.php     2016-06-09 23:03:34 UTC (rev 3327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,71 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
+use WordPressdotorg\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Template;
+
+/**
+ * The Plugin Stats metabox.
+ *
+ * @package WordPressdotorg\Plugin_Directory\Admin\Metabox
+ */
+class Stats {
+
+       /**
+        * Displays the stats metabox for plugins.
+        *
+        * @global \wpdb $wpdb WordPress database abstraction object.
+        *
+        * @param \WP_Post $post
+        */
+       static function display( $post ) {
+               global $wpdb;
+
+               wp_enqueue_script( 'google-jsapi', 'https://www.google.com/jsapi', array(), false, true );
+               wp_enqueue_script( 'wporg-plugins-stats', plugins_url( 'js/stats.js', Plugin_Directory\PLUGIN_FILE ) , array( 'jquery', 'google-jsapi' ), time(), true );
+               wp_localize_script( 'wporg-plugins-stats', 'pluginStats', array(
+                       'slug' => $post->post_name,
+                       'l10n' => array(
+                               'date'          => __( 'Date', 'wporg-plugins' ),
+                               'downloads'     => __( 'Downloads', 'wporg-plugins' ),
+                               'noData'        => __( 'No data yet', 'wporg-plugins' ),
+                               'otherVersions' => __( 'Other Versions', 'wporg-plugins' ),
+                       ),
+               ) );
+
+               $today     = $wpdb->get_var( $wpdb->prepare( "SELECT downloads FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND plugin_slug = %s", gmdate( 'Y-m-d' ), $post->post_name ) );
+               $yesterday = $wpdb->get_var( $wpdb->prepare( "SELECT downloads FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND stamp < %s AND plugin_slug = %s",
+                       gmdate( 'Y-m-d', time() - DAY_IN_SECONDS ), gmdate( 'Y-m-d' ), $post->post_name
+               ) );
+               $last_week = $wpdb->get_var( $wpdb->prepare( "SELECT SUM(downloads) FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND plugin_slug = %s",
+                       gmdate( 'Y-m-d', time() - WEEK_IN_SECONDS ), $post->post_name
+               ) );
+
+               ?>
+               <h5><?php _e( 'Active versions', 'wporg-plugins' ); ?></h5>
+               <div id="plugin-version-stats" class="chart"></div>
+
+               <h5><?php _e( 'Downloads Per Day', 'wporg-plugins' ); ?></h5>
+               <div id="plugin-download-stats" class="chart"></div>
+
+               <h5><?php _e( 'Downloads history', 'wporg-plugins' ); ?></h5>
+               <table>
+                       <tr>
+                               <th scope="row"><?php _e( 'Today', 'wporg-plugins' ); ?></th>
+                               <td><?php echo number_format_i18n( $today ); ?></td>
+                       </tr>
+                       <tr>
+                               <th scope="row"><?php _e( 'Yesterday', 'wporg-plugins' ); ?></th>
+                               <td><?php echo number_format_i18n( $yesterday ); ?></td>
+                       </tr>
+                       <tr>
+                               <th scope="row"><?php _e( 'Last Week', 'wporg-plugins' ); ?></th>
+                               <td><?php echo number_format_i18n( $last_week ); ?></td>
+                       </tr>
+                       <tr>
+                               <th scope="row"><?php _e( 'All Time', 'wporg-plugins' ); ?></th>
+                               <td><?php echo number_format_i18n( Template::get_downloads_count( $post ) ); ?></td>
+                       </tr>
+               </table>
+               <?php
+       }
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassstatsphp"></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-stats.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-stats.php      2016-06-09 22:28:14 UTC (rev 3326)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-stats.php        2016-06-09 23:03:34 UTC (rev 3327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,6 @@
</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\Shortcodes;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use WordPressdotorg\Plugin_Directory\Template;
</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">  * The [wporg-plugins-stats] shortcode handler to display a plugins statistics.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,13 +10,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Stats {
</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">-         * @global \wpdb $wpdb WordPress database abstraction object.
</del><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        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><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'google-jsapi', 'https://www.google.com/jsapi', array(), false, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,39 +28,7 @@
</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">-                $today     = $wpdb->get_var( $wpdb->prepare( "SELECT downloads FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND plugin_slug = %s", gmdate( 'Y-m-d' ), $post->post_name ) );
-               $yesterday = $wpdb->get_var( $wpdb->prepare( "SELECT downloads FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND stamp < %s AND plugin_slug = %s",
-                       gmdate( 'Y-m-d', time() - DAY_IN_SECONDS ), gmdate( 'Y-m-d' ), $post->post_name
-               ) );
-               $last_week = $wpdb->get_var( $wpdb->prepare( "SELECT SUM(downloads) FROM " . PLUGINS_TABLE_PREFIX . "stats WHERE stamp >= %s AND plugin_slug = %s",
-                       gmdate( 'Y-m-d', time() - WEEK_IN_SECONDS ), $post->post_name
-               ) );
-
-               return
-                       '<h5>' . __( 'Active versions', 'wporg-plugins' ) . '</h5>' .
-                       '<div id="plugin-version-stats" class="chart"></div>' .
-
-                       '<h5>' . __( 'Downloads Per Day', 'wporg-plugins' ) . '</h5>' .
-                       '<div id="plugin-download-stats" class="chart"></div>' .
-
-                       '<h5>' . __( 'Downloads history', 'wporg-plugins' ) . '</h5>' .
-                       '<table>' .
-                               '<tr>' .
-                                       '<th scope="row">' . __( 'Today', 'wporg-plugins' ) . '</th>' .
-                                       '<td>' . number_format_i18n( $today ) . '</td>' .
-                               '</tr>' .
-                               '<tr>' .
-                                       '<th scope="row">' . __( 'Yesterday', 'wporg-plugins' ) . '</th>' .
-                                       '<td>' . number_format_i18n( $yesterday ) . '</td>' .
-                               '</tr>' .
-                               '<tr>' .
-                                       '<th scope="row">' . __( 'Last Week', 'wporg-plugins' ) . '</th>'.
-                                       '<td>' . number_format_i18n( $last_week ) . '</td>'.
-                               '</tr>' .
-                               '<tr>' .
-                                       '<th scope="row">' . __( 'All Time', 'wporg-plugins' ) . '</th>' .
-                                       '<td>' . number_format_i18n( Template::get_downloads_count( $post ) ) . '</td>' .
-                               '</tr>'.
-                       '</table>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return '<h5>' . __( 'Active versions', 'wporg-plugins' ) . '</h5>' .
+                       '<div id="plugin-version-stats" class="chart"></div>';
</ins><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>