<!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>[7619] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp: Multiple changes to Meetup Application.</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/7619">7619</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/7619","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-08-17 09:32:41 +0000 (Fri, 17 Aug 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: Multiple changes to Meetup Application.
1. Make styling more consistent of Meetup Application with WordCamp Application.
2. Added more statuses and tags. Specifically, added checkboxes for statuses like Needs Swag, Needs Orientation etc, which will add a tag for easy filtering.
3. Added tag column in Meetup listing view.
4. Add different questions for Meetup location and for organizer's mailing address.
5. Street address, state and zip code fields are optional.
6. Added log box for tracking tag changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptcssapplicationsmeetupcss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/css/applications/meetup.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationsmeetupshortcodeapplicationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/meetup/shortcode-application.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventclasseventapplicationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/class-event-application.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptfunctionsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptmeetupclassmeetupadminphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-meetup/class-meetup-admin.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptmeetupclassmeetupapplicationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-meetup/class-meetup-application.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampclasswordcampapplicationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/class-wordcamp-application.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptcssapplicationsmeetupcss"></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/css/applications/meetup.css</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/css/applications/meetup.css 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/css/applications/meetup.css 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #meetup-application textarea {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-top: .15em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: .20em;
+ font-weight: normal;
</ins><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">+#meetup-application input[type="submit"] {
+ width: 165px;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationsmeetupshortcodeapplicationphp"></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/views/applications/meetup/shortcode-application.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/views/applications/meetup/shortcode-application.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/meetup/shortcode-application.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,107 +13,138 @@
</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"> <form id="meetup-application" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- First Name
- <span class="required-indicator">(required)</span>
- <input type="text" name="q_first_name" required/>
- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="PDF_pageInner">
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Please enter your name.
+ <span class="required-indicator">(required)</span>
+ <input type="text" name="q_name" required/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Please enter you email address.
+ <span class="required-indicator">(required)</span>
+ <input type="email" name="q_email" required/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label> Please enter your mailing address (at least your city/state or city/country). </label>
+ <label>
+ Address Line 1
+ <input type="text" name="q_address_line_1">
+ </label>
+ <label>
+ Address Line 2
+ <input type="text" name="q_address_line_2">
+ </label>
+ <label>
+ City
+ <span class="required-indicator">(required)</span>
+ <input type="text" name="q_city" required/>
+ </label>
+ <label>
+ State/Province
+ <input type="text" name="q_state"/>
+ </label>
+ <label>
+ Country
+ <span class="required-indicator">(required)</span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- Last Name
- <span class="required-indicator">(required)</span>
- <input type="text" name="q_last_name" required/>
- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="q_country" required>
+ <option value=""></option>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- Email Address
- <span class="required-indicator">(required)</span>
- <input type="email" name="q_email" required/>
- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $countries as $country ) : ?>
+ <option value="<?php echo esc_attr( $country['alpha2'] ); ?>">
+ <?php echo esc_html( $country['name'] ); ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ </label>
+ <label>
+ ZIP/Postal Code
+ <input type="text" name="q_zip"/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Enter the city, state/province, and country where you would like to organize a Meetup
+ <input type="text" name="q_mtp_loc" required/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Is there already a WordPress meetup group in this city?
+ <span class="required-indicator">(required)</span>
+ <span class="label-description">If you don't know, please <a
+ href="https://www.meetup.com/topics/wordpress/"
+ target="_blank" rel="noopener noreferrer">check Meetup.com</a> first.</span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- City
- <span class="required-indicator">(required)</span>
- <input type="text" name="q_city" required/>
- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="q_already_a_meetup" required>
+ <option value=""></option>
+ <option>Nope, no current meetup group</option>
+ <option>Yes, it's the meetup I run now</option>
+ <option>Yes, but I want to do a different kind of meetup</option>
+ </select>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ <!-- todo: Show/hide this via JavaScript based on selected answer above -->
+ If there's an existing Meetup.com group, please provide the URL
+ <input type="url" name="q_existing_meetup_url"/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ How would you describe yourself?
+ <span class="required-indicator">(required)</span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>
- State/Province
- <span class="required-indicator">(required)</span>
- <input type="text" name="q_state" required/>
- </label>
-
- <label>
- Country
- <span class="required-indicator">(required)</span>
-
- <select name="q_country" required>
- <option value=""></option>
-
- <?php foreach ( $countries as $country ) : ?>
- <option value="<?php echo esc_attr( $country['alpha2'] ); ?>">
- <?php echo esc_html( $country['name'] ); ?>
- </option>
- <?php endforeach; ?>
- </select>
- </label>
-
- <label>
- ZIP/Postal Code <span class="required-indicator">(required)</span>
- <input type="text" name="q_zip" required/>
- </label>
-
- <label>
- Is there already a WordPress meetup group in your city?
- <span class="required-indicator">(required)</span>
- <span class="label-description">If you don't know, please <a href="https://www.meetup.com/topics/wordpress/"
- target="_blank" rel="noopener noreferrer">check Meetup.com</a> first.</span>
-
- <select name="q_already_a_meetup" required>
- <option value=""></option>
- <option>Nope, no current meetup group</option>
- <option>Yes, it's the meetup I run now</option>
- <option>Yes, but I want to do a different kind of meetup</option>
- </select>
- </label>
-
- <label>
- <!-- todo: Show/hide this via JavaScript based on selected answer above -->
- If there's an existing Meetup.com group, please provide the URL
- <input type="url" name="q_existing_meetup_url"/>
- </label>
-
- <label>
- How would you describe yourself?
- <span class="required-indicator">(required)</span>
-
- <select name="q_describe_yourself" required>
- <option value=""></option>
- <option>WordPress professional</option>
- <option>Current WordPress user or developer</option>
- <option>New to WordPress</option>
- <option>I don't use WordPress</option>
- </select>
- </label>
-
- <label>
- Your <a href="https://wordpress.org" target="_blank">WordPress.org</a> username
- <span class="required-indicator">(required)</span>
- <input type="text" name="q_wporg_username" required/>
- </label>
-
- <label>
- Your <a href="https://chat.wordpress.org" target="_blank">WordPress Slack</a> username
- <input type="text" name="q_wp_slack_username"/>
- </label>
-
- <label>
- Anything you'd like to tell us about yourself, or what you hope to do with a meetup group?
- <textarea name="slack_username"></textarea>
- </label>
-
- <?php submit_button( 'Submit Application', 'primary', 'submit-application' ); ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="q_describe_yourself" required>
+ <option value=""></option>
+ <option>WordPress professional</option>
+ <option>Current WordPress user or developer</option>
+ <option>New to WordPress</option>
+ <option>I don't use WordPress</option>
+ </select>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Your <a href="https://wordpress.org" target="_blank">WordPress.org</a> username
+ <span class="required-indicator">(required)</span>
+ <input type="text" name="q_wporg_username" required/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Your <a href="https://chat.wordpress.org" target="_blank">WordPress Slack</a> username
+ <input type="text" name="q_wp_slack_username"/>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <label>
+ Anything you'd like to tell us about yourself, or what you hope to do with a meetup group?
+ <textarea name="q_additional_comments"></textarea>
+ </label>
+ </div>
+ <div class="PDF_questionDivide"></div>
+ <div class="PDF_question">
+ <div class="submit-button">
+ <?php submit_button( 'Submit Application', 'primary', 'submit-application', false ); ?>
+ </div>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventclasseventapplicationphp"></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/class-event-application.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/class-event-application.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/class-event-application.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 1
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_style(
+ 'wordcamp-application',
+ plugins_url( 'css/applications/wordcamp.css', __DIR__ ),
+ array( 'wp-community-applications' ),
+ 1
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'wordcamp-application' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'wp-community-applications' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptfunctionsphp"></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-functions.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-functions.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wcpt_log_metabox( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $entries = wcpt_get_log_entries( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( __DIR__ . '/views/common/metabox-log.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require( __DIR__ . '/views/common/metabox-log.php' );
</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">@@ -86,20 +86,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status_changes = get_post_meta( $event_id, '_status_change' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'note' => $private_notes, 'status_change' => $status_changes ) as $entry_type => $raw_entries ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $raw_entries as $entry ) {
- $user = get_user_by( 'id', $entry['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entries = array_merge( process_raw_entries( $raw_entries, $entry_type ), $entries );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user ) {
- $entry['user_display_name'] = $user->display_name;
- } else {
- // Assume that the action was performed during a cron job
- $entry['user_display_name'] = 'WordCamp Bot';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $entries;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $entry['type'] = $entry_type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Add displayable data to raw entries
+ *
+ * @param array $raw_entries
+ * @param string $entry_type Type of entry
+ *
+ * @return array
+ */
+function process_raw_entries ( $raw_entries, $entry_type ) {
+ $entries = array();
+ foreach ( $raw_entries as $entry ) {
+ $user = get_user_by( 'id', $entry['user_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">- $entries[] = $entry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user ) {
+ $entry['user_display_name'] = $user->display_name;
+ } else {
+ // Assume that the action was performed during a cron job
+ $entry['user_display_name'] = 'WordCamp Bot';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $entry['type'] = $entry_type;
+
+ $entries[] = $entry;
</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"> usort( $entries, 'wcpt_sort_log_entries' );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptmeetupclassmeetupadminphp"></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-meetup/class-meetup-admin.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-meetup/class-meetup-admin.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-meetup/class-meetup-admin.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Meetup_Admin extends Event_Admin {
</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">+ * Meetup_Admin constructor.
+ */
+ public function __construct() {
+ parent::__construct();
+
+ add_action( 'wcpt_metabox_save_done', array( $this, 'save_tag_checkboxes' ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Return user facing label of event type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Title', 'wcpt' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'swag_needed' => __( 'Swag Needed', 'wcpt' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tags' => __( 'Tags', 'wcpt' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'organizer' => __( 'Organizer', 'wcpt' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => __( 'Date', 'wcpt' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup.com_url' => __( 'Meetup URL', 'wcpt' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,11 +125,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'helpscout_url':
</span><span class="cx" style="display: block; padding: 0 10px"> $this->print_clickable_link( get_post_meta( $post_id, 'HelpScout link', true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'swag_needed':
- if ( get_post_meta( $post_id, 'Needs swag', true ) ) {
- echo "<span class='dashicons dashicons-star-filled swag-needed-icon'></span>";
- }
- break;
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,6 +189,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Meetup_Application::POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'advanced'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ add_meta_box(
+ 'wcpt_show_tag_logs',
+ 'Tag logs',
+ array( $this, 'wcpt_tag_log_metabox' ),
+ $this->get_event_type(),
+ 'advanced',
+ 'low'
+ );
+
</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">@@ -247,6 +261,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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Renders tags logs
+ */
+ public function wcpt_tag_log_metabox() {
+ global $post_id;
+ $entries = get_post_meta( $post_id, '_tags_log' );
+ $entries = process_raw_entries( $entries, 'Tag changed' );
+ require( WCPT_DIR . '/views/common/metabox-log.php' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Meta keys group for Meetup Event.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $meta_group
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,24 +280,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function meta_keys( $meta_group = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $info_keys = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Meetup URL' => 'text',
- 'HelpScout link' => 'text',
- 'City' => 'text',
- 'State' => 'text',
- 'Country' => 'text',
- 'Zip' => 'text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Meetup URL' => 'text',
+ 'HelpScout link' => 'text',
+ 'Meetup Location' => 'text',
</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"> $application_keys = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Date Applied' => 'date',
- 'Date of Last Contact' => 'date',
- 'Who contacted' => 'text',
- 'Vetted Date' => 'date',
- 'Vetted by' => 'text',
- 'Orientation Date' => 'date',
- 'Oriented by' => 'text',
- 'Joined chapter date' => 'date',
- 'Joined chapter by' => 'text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Date Applied' => 'date',
+ 'Already a meetup' => 'text',
+ 'Date of Last Contact' => 'date',
+ 'Who contacted' => 'text',
+ 'Vetted Date' => 'date',
+ 'Vetted by' => 'text',
+ 'Orientation Date' => 'date',
+ 'Oriented by' => 'text',
+ 'Joined chapter date' => 'date',
+ 'Joined chapter by' => 'text',
+ 'More Information requested' => 'checkbox',
+ 'Changes Requested' => 'checkbox',
+ 'Needs Meeting' => 'checkbox'
</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"> $organizer_keys = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,10 +306,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Email' => 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Primary organizer WordPress.org username' => 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Co-Organizers usernames (seperated by comma)' => 'text',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Organizer description' => 'text',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Date closed' => 'date',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Skype/Slack' => 'text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Slack' => 'text',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Region' => 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Address' => 'textarea',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Extra Comments' => 'textarea',
</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"> $swag_keys = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,6 +343,72 @@
</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="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Toggle tags that are rendered as checkboxes
+ *
+ * @param int $post_id
+ */
+ public function save_tag_checkboxes( $post_id ) {
+
+ $post_tags = wp_get_post_tags( $post_id, array( 'fields' => 'names' ) );
+
+ $post_tags = $this->add_or_remove_tag( $post_id, $post_tags, 'wcpt_needs_swag', 'Needs Swag', $_POST['wcpt_swag_notes'] );
+
+ $post_tags = $this->add_or_remove_tag( $post_id, $post_tags, 'wcpt_more_information_requested', 'More Information requested' );
+
+ $post_tags = $this->add_or_remove_tag( $post_id, $post_tags, 'wcpt_changes_requested', 'Changes Requested' );
+
+ $post_tags = $this->add_or_remove_tag( $post_id, $post_tags, 'wcpt_needs_meeting', 'Needs Meeting' );
+
+ if ( $post_tags != wp_get_post_tags( $post_id ) ) {
+ wp_set_post_tags( $post_id, $post_tags );
+ }
+ }
+
+ /**
+ * Add or remove tag. Also logs and make a note when required
+ *
+ * @param $post_id
+ * @param $tag_array
+ * @param $input_name
+ * @param $label
+ * @param string $note_message
+ *
+ * @return array
+ */
+ public function add_or_remove_tag( $post_id, $tag_array, $input_name, $label, $note_message = '' ) {
+
+ if ( $note_message !== '' ) {
+ $note_message = ' Note: ' . $note_message;
+ }
+
+ if ( isset( $_POST[ $input_name] ) && $_POST[ $input_name ] && ( ! in_array( $label, $tag_array ) ) ) {
+
+ $tag_array[] = $label;
+
+ add_post_meta(
+ $post_id, '_tags_log', array(
+ 'timestamp' => time(),
+ 'user_id' => get_current_user_id(),
+ 'message' => 'Tag ' . $label . ' added.' . $note_message,
+ )
+ );
+
+ } elseif ( ! isset( $_POST[ $input_name] ) && in_array( $label, $tag_array ) ) {
+ $tag_array = array_diff( $tag_array, array( $label ) );
+
+ add_post_meta(
+ $post_id, '_tags_log', array(
+ 'timestamp' => time(),
+ 'user_id' => get_current_user_id(),
+ 'message' => 'Tag ' . $label . ' removed.' . $note_message,
+ )
+ );
+ }
+
+ return $tag_array;
+ }
</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"> endif;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptmeetupclassmeetupapplicationphp"></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-meetup/class-meetup-application.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-meetup/class-meetup-application.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-meetup/class-meetup-application.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,17 +54,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_post_statuses() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-nds-vet' => _x( 'Needs Vetting', 'Meetup status', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-mtp-more-info' => _x( 'More Info Requested', 'Meetup status', 'wordcamporg' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-nds-ori' => _x( 'Needs Orientation/Interview', 'Meetup status', 'wordcamporg' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcpt-mtp-schdlng' => _x( 'Scheduling', 'Meetup status', 'wordcamporg' ),
+ 'wcpt-mtp-schdld' => _x( 'Scheduled', 'Meetup status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-nds-sit' => _x( 'Needs Site', 'Meetup status', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-nds-trn' => _x( 'Needs Transfer', 'Meetup status', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-nds-nw-ow' => _x( 'Needs to assign new owner', 'Meetup status', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-chng-req' => _x( 'Changes requested', 'Meetup status', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-mtp-nds-swag' => _x( 'Needs Swag', 'Meetup status', 'wordcamporg' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-rejected' => _x( 'Declined', 'Meetup status', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-mtp-active' => _x( 'Active', 'Meetup status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcpt-mtp-active' => _x( 'Active in the chapter', 'Meetup status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-mtp-dormant' => _x( 'Dormant', 'Meetup status', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-mtp-removed' => _x( 'Removed', 'Meetup status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcpt-mtp-removed' => _x( 'Removed from the chapter', 'Meetup status', 'wordcamporg' ),
</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">@@ -128,13 +128,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $unsafe_data = shortcode_atts( $this->get_default_application_values(), $unsafe_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $required_fields = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'q_first_name',
- 'q_last_name',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_name',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'q_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_city',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'q_state',
</del><span class="cx" style="display: block; padding: 0 10px"> 'q_country',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'q_zip',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_mtp_loc',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'q_already_a_meetup',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_describe_yourself',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_wporg_username',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,6 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $required_fields as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $safe_data[ $field ] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ error_log('field is: '. $field);
</ins><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'required_fields', "Please click on your browser's Back button, and fill in all of the required fields." );
</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">@@ -165,18 +164,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_default_application_values() {
</span><span class="cx" style="display: block; padding: 0 10px"> // WordCamp uses an ID with questions. Not sure how are they used. Ask @corey
</span><span class="cx" style="display: block; padding: 0 10px"> $values = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'q_first_name' => '',
- 'q_last_name' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_name' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'q_email' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_address_line_1' => '',
+ 'q_address_line_2' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'q_city' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_state' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_country' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_zip' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_mtp_loc' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'q_already_a_meetup' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_existing_meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_describe_yourself' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_wporg_username' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'q_wp_slack_username' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'q_additional_comments' => '',
</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 $values;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,14 +193,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function create_post( $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wcorg_get_user_by_canonical_names( $data['q_wporg_username'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wordcamp_user_id = get_user_by( 'email', 'support@wordcamp.org' )->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> $statuses = self::get_post_statuses();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => self::get_event_type(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_title' => $data['q_city'] . ', ' . $data['q_country'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_title' => esc_html( $data['q_mtp_loc'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => self::get_default_status(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_author' => is_a( $user, 'WP_User' ) ? $user->ID : 0,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_author' => $wordcamp_user_id,
</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"> $post_id = wp_insert_post( $post, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,30 +212,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Populate the meta fields.
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, '_application_data', $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_post_meta(
- $post_id, 'Organizer Name', sprintf(
- '%s %s',
- $data['q_first_name'],
- $data['q_last_name']
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $organizer_address = <<<ADDRESS
+ {$data['q_address_line_1']}
+ {$data['q_address_line_2']}
+ {$data['q_city']}, {$data['q_state']}, {$data['q_country']}
+ {$data['q_zip']}
+ADDRESS;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id, 'Organizer Name', $data['q_name'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Email', $data['q_email'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_post_meta( $post_id, 'City', $data['q_city'] );
- add_post_meta( $post_id, 'State', $data['q_state'] );
- add_post_meta( $post_id, 'Country', $data['q_country'] );
- add_post_meta( $post_id, 'Zip', $data['q_zip'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id, 'City', $data['q_mtp_loc'] );
+ add_post_meta( $post_id, 'Address', $organizer_address );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Already a meetup', $data['q_already_a_meetup'] );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Meetup URL', $data['q_existing_meetup_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Best describe organizer', $data['q_describe_yourself'] );
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Primary organizer WordPress.org username', $data['q_wporg_username'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_post_meta( $post_id, 'Skype/Slack', $data['q_wp_slack_username'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id, 'Slack', $data['q_wp_slack_username'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, 'Date Applied', time() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_post_meta( $post_id, 'Extra Comments', $data['q_additional_comments'] );
+ add_post_meta( $post_id, 'Meetup Location', $data['q_mtp_loc'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id, '_status_change', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'timestamp' => time(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_id' => is_a( $user, 'WP_User' ) ? $user->ID : 0,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_id' => $wordcamp_user_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => sprintf( '%s → %s', 'Application', $statuses[ self::get_default_status() ] ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampclasswordcampapplicationphp"></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-wordcamp/class-wordcamp-application.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-wordcamp/class-wordcamp-application.php 2018-08-17 02:43:06 UTC (rev 7618)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/class-wordcamp-application.php 2018-08-17 09:32:41 UTC (rev 7619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,16 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> true
</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">- wp_register_style(
- 'wordcamp-application',
- plugins_url( 'css/applications/wordcamp.css', __DIR__ ),
- array( 'wp-community-applications' ),
- 1
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post->post_content ) && has_shortcode( $post->post_content, self::SHORTCODE_SLUG ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wordcamp-application' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'wordcamp-application' );
</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">
</span></span></pre>
</div>
</div>
</body>
</html>