<!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>[7904] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports: WordCamp Reports: Add ability to search meetup events.</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/7904">7904</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/7904","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-27 01:40:32 +0000 (Tue, 27 Nov 2018)</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'>WordCamp Reports: Add ability to search meetup events.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassbasephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-base.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassmeetupeventsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-meetup-events.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportmeetupeventsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-events.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-base.php 2018-11-27 01:40:28 UTC (rev 7903)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-base.php 2018-11-27 01:40:32 UTC (rev 7904)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,6 +151,47 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the data rows based on a search query.
+ *
+ * @param array $data
+ *
+ * @return array
+ */
+ protected function filter_data_rows( array $data ) {
+ if ( empty( $this->options['search_query'] ) ) {
+ return $data;
+ }
+
+ $terms = explode( ',', $this->options['search_query'] );
+ $terms = array_map( 'trim', $terms );
+
+ foreach ( $data as $index => $row ) {
+ $match = false;
+
+ foreach ( $terms as $term ) {
+ foreach ( $this->options['search_fields'] as $field ) {
+ // Private search fields will be missing in the context of a public report.
+ if ( ! isset( $row[ $field ] ) ) {
+ continue;
+ }
+
+ if ( false !== stripos( $row[ $field ], $term ) ) {
+ $match = true;
+ break 2;
+ }
+ }
+ }
+
+ if ( ! $match ) {
+ unset( $data[ $index ] );
+ }
+ }
+
+ // Re-index the array to remove gaps.
+ return array_values( $data );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Determine the data fields safelist based on the context of the report.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The list of fields that are safe to include.
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassmeetupeventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-meetup-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-meetup-events.php 2018-11-27 01:40:28 UTC (rev 7903)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-meetup-events.php 2018-11-27 01:40:32 UTC (rev 7904)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,6 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key_segments = [
</span><span class="cx" style="display: block; padding: 0 10px"> parent::get_cache_key(),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->range->generate_cache_key_segment(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->options['search_query'],
</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"> return implode( '_', $cache_key_segments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +197,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"> $data = $this->filter_data_fields( $data );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $this->filter_data_rows( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->maybe_cache_data( $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,6 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function render_admin_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $start_date = filter_input( INPUT_POST, 'start-date' );
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date = filter_input( INPUT_POST, 'end-date' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_query = sanitize_text_field( filter_input( INPUT_POST, 'search-query' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $refresh = filter_input( INPUT_POST, 'refresh', FILTER_VALIDATE_BOOLEAN );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = filter_input( INPUT_POST, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = filter_input( INPUT_POST, self::$slug . '-nonce' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,6 +420,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'earliest_start' => new DateTime( '2015-01-01' ), // Chapter program started in 2015.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'search_query' => $search_query,
+ 'search_fields' => self::get_search_fields(),
</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"> if ( $refresh ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,6 +435,15 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a list of fields that will be checked during search queries.
+ *
+ * @return array
+ */
+ protected static function get_search_fields() {
+ return array( 'name', 'description' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Export the report data to a file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,6 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function export_to_file() {
</span><span class="cx" style="display: block; padding: 0 10px"> $start_date = filter_input( INPUT_POST, 'start-date' );
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date = filter_input( INPUT_POST, 'end-date' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_query = sanitize_text_field( filter_input( INPUT_POST, 'search-query' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $refresh = filter_input( INPUT_POST, 'refresh', FILTER_VALIDATE_BOOLEAN );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = filter_input( INPUT_POST, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = filter_input( INPUT_POST, self::$slug . '-nonce' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,6 +468,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'earliest_start' => new DateTime( '2015-01-01' ), // Chapter program started in 2015.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'search_query' => $search_query,
+ 'search_fields' => self::get_search_fields(),
</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"> if ( $refresh ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportmeetupeventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-events.php 2018-11-27 01:40:28 UTC (rev 7903)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-events.php 2018-11-27 01:40:32 UTC (rev 7904)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var string $start_date */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var string $end_date */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var string $search_query */
</ins><span class="cx" style="display: block; padding: 0 10px"> /** @var Report\Meetup_Events|null $report */
</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">@@ -41,6 +42,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="date" id="end-date" name="end-date" value="<?php echo esc_attr( $end_date ) ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="meetup-search-query">Search</label></th>
+ <td>
+ <input type="text" id="meetup-search-query" name="search-query" value="<?php echo esc_attr( $search_query ) ?>" />
+ <p class="description">Enter comma-separate list of terms. Results will be filtered to only include events that match at least one term. You should manually verify that the results are accurate.</p>
+ </td>
+ </tr>
+ <tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="refresh">Refresh results</label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="checkbox" id="refresh" name="refresh" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre>
</div>
</div>
</body>
</html>