<!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>[7979] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php: WCPT Application Tracker: Add support for Meetup applications</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/7979">7979</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/7979","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-17 07:34:32 +0000 (Mon, 17 Dec 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'>WCPT Application Tracker: Add support for Meetup applications</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventtrackerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventtrackerphp"></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/wcpt/wcpt-event/tracker.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/wcpt/wcpt-event/tracker.php 2018-12-17 07:34:25 UTC (rev 7978)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php 2018-12-17 07:34:32 UTC (rev 7979)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,29 +22,39 @@
</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">- * Get camps that are active enough to be shown on the tracker
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get applications that are active enough to be shown on the tracker
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $application_type Type of application. Could be `wordcamp` or `meetup`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_active_wordcamps() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_active_events( $application_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wordcamps = array();
- $statuses = WordCamp_Loader::get_post_statuses();
- $milestones = WordCamp_Loader::map_statuses_to_milestones();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $events = array();
+ $shown_statuses = array();
+ $statuses = array();
+ $milestones = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $inactive_timestamp = strtotime( '60 days ago' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shown_statuses = $statuses;
- unset( $shown_statuses[ WCPT_FINAL_STATUS ] );
- $shown_statuses = array_keys( $shown_statuses );
- $wordcamp_post_type = WCPT_POST_TYPE_ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wordcamp' === $application_type ) {
+ $statuses = WordCamp_Loader::get_post_statuses();
+ $milestones = WordCamp_Loader::map_statuses_to_milestones();
+ unset( $shown_statuses[ WCPT_FINAL_STATUS ] );
+ $post_type = WCPT_POST_TYPE_ID;
+ } elseif ( 'meetup' === $application_type ) {
+ $statuses = \Meetup_Loader::get_post_statuses();
+ $post_type = WCPT_MEETUP_SLUG;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wordcamp_post_objs = $wpdb->get_results(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shown_statuses = array_keys( $statuses );
+
+ $event_post_objs = $wpdb->get_results(
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT DISTINCT post_id, MAX( meta_value ) as last_updated
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->prefix}postmeta
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- meta_key like '_status_change_log_$wordcamp_post_type%'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ meta_key like '_status_change_log_$post_type%'
</ins><span class="cx" style="display: block; padding: 0 10px"> AND
</span><span class="cx" style="display: block; padding: 0 10px"> meta_value >= %d
</span><span class="cx" style="display: block; padding: 0 10px"> GROUP BY post_id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,36 +62,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $inactive_timestamp
</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">- $wordcamp_post_obj = array();
- foreach ( $wordcamp_post_objs as $wordcamp_post ) {
- $wordcamp_post_obj[ $wordcamp_post->post_id ] = $wordcamp_post->last_updated;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $event_posts = array();
+ foreach ( $event_post_objs as $event_post ) {
+ $event_posts[ $event_post->post_id ] = $event_post->last_updated;
</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"> $raw_posts = get_posts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' => WCPT_POST_TYPE_ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => $post_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => $shown_statuses,
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 1000,
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'post_title',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post__in' => array_keys ( $wordcamp_post_obj ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post__in' => array_keys ( $event_posts ),
</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 class="cx" style="display: block; padding: 0 10px"> foreach ( $raw_posts as $key => $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $last_update_timestamp = $wordcamp_post_obj[ $post->ID ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_update_timestamp = $event_posts[ $post->ID ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wordcamps[] = array(
- 'city' => $post->post_title,
- 'cityUrl' => filter_var( get_post_meta( $post->ID, 'URL', true ), FILTER_VALIDATE_URL ),
- 'applicant' => get_post_meta( $post->ID, 'Organizer Name', true ),
- 'milestone' => $milestones[ $post->post_status ],
- 'status' => $statuses[ $post->post_status ],
- 'lastUpdate' => time() - $last_update_timestamp,
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wordcamp' === $application_type ) {
+ $events[] = array(
+ 'city' => $post->post_title,
+ 'cityUrl' => filter_var( get_post_meta( $post->ID, 'URL', true ), FILTER_VALIDATE_URL ),
+ 'applicant' => esc_html( get_post_meta( $post->ID, 'Organizer Name', true ) ),
+ 'milestone' => $milestones[ $post->post_status ],
+ 'status' => $statuses[ $post->post_status ],
+ 'lastUpdate' => time() - $last_update_timestamp,
+ );
+ } elseif ( 'meetup' === $application_type ) {
+ $events[] = array(
+ 'city' => $post->post_title,
+ 'cityUrl' => filter_var( get_post_meta( $post->ID, 'Meetup URL', true ), FILTER_VALIDATE_URL ),
+ 'applicant' => esc_html( get_post_meta( $post->ID, 'Organizer Name', true ) ),
+ 'status' => $statuses[ $post->post_status ],
+ 'lastUpdate' => time() - $last_update_timestamp,
+ );
+ }
</ins><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">- return $wordcamps;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $events;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,14 +110,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_wordcamp_display_columns() {
- return array(
- 'city' => 'City',
- 'applicant' => 'Applicant',
- 'milestone' => 'Milestone',
- 'status' => 'Status',
- 'lastUpdate' => 'Updated',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_display_columns( $application_type ) {
+ switch ( $application_type ) {
+ case 'wordcamp':
+ return array(
+ 'city' => 'City',
+ 'applicant' => 'Applicant',
+ 'milestone' => 'Milestone',
+ 'status' => 'Status',
+ 'lastUpdate' => 'Updated',
+ );
+ case 'meetup':
+ return array(
+ 'city' => 'City',
+ 'applicant' => 'Applicant',
+ 'status' => 'Status',
+ 'lastUpdate' => 'Updated',
+ );
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,26 +158,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'wpc-application-tracker' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wordcamp' === $application_type ) {
- wp_localize_script(
- 'wpc-application-tracker',
- 'wpcApplicationTracker',
- array(
- 'applications' => get_active_wordcamps(),
- 'displayColumns' => get_wordcamp_display_columns(),
- 'initialSortField' => 'city',
- )
- );
- } elseif ( 'meetup' === $application_type ) {
- wp_localize_script(
- 'wpc-application-tracker',
- 'wpcApplicationTracker',
- array(
- 'applications',
- 'displayColumns',
- 'initialSortField',
- )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_localize_script(
+ 'wpc-application-tracker',
+ 'wpcApplicationTracker',
+ array(
+ 'applications' => get_active_events( $application_type ),
+ 'displayColumns' => get_display_columns( $application_type ),
+ 'initialSortField' => 'city',
+ )
+ );
</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>