<!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>[2811] sites/branches/application-tracking/wordcamp.org: Sync with trunk.</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/2811">2811</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/2811","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-25 14:20:21 +0000 (Fri, 25 Mar 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'>Sync with trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporg">sites/branches/application-tracking/wordcamp.org/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/branches/application-tracking/wordcamp.org
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/branches/application-tracking/wordcamp.org 2016-03-25 14:07:27 UTC (rev 2810)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/branches/application-tracking/wordcamp.org 2016-03-25 14:20:21 UTC (rev 2811)
</ins><a id="sitesbranchesapplicationtrackingwordcamporg"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/branches/application-tracking/wordcamp.org</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mergeinfo</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/sites/trunk/wordcamp.org:2783-2810
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php 2016-03-25 14:07:27 UTC (rev 2810)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php 2016-03-25 14:20:21 UTC (rev 2811)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,8 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'force_login_to_view_form' ), 9 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( $this, 'populate_form_based_on_user' ), 9 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'grunion_pre_message_sent', array( $this, 'returning_organizer_application' ), 10, 3 );
- add_action( 'grunion_pre_message_sent', array( $this, 'new_organizer_application' ), 10, 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'grunion_pre_message_sent', array( $this, 'call_for_sponsors' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'grunion_pre_message_sent', array( $this, 'call_for_speakers' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,111 +196,6 @@
</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">- * Create a draft WordCamp post from a Returning Organizer Application submission.
- *
- * @param int $submission_id
- * @param array $all_values
- * @param array $extra_values
- */
- public function returning_organizer_application( $submission_id, $all_values, $extra_values ) {
- if ( 'returning-organizer-application' != $this->get_form_key( $submission_id ) ) {
- return;
- }
-
- $all_values = $this->get_unprefixed_grunion_form_values( $all_values );
- $wordcamp_to_form_key_map = array(
- 'Location' => 'WordCamp City, State, Country',
- 'Organizer Name' => 'Lead Organizer Name',
- 'WordPress.org Username' => 'Lead Organizer WordPress.org Username',
- 'Email Address' => 'Lead Organizer Email',
- 'Sponsor Wrangler Name' => 'Sponsor Wrangler Name',
- 'Sponsor Wrangler E-mail Address' => 'Sponsor Wrangler E-mail Address',
- 'Budget Wrangler Name' => 'Budget Wrangler Name',
- 'Budget Wrangler E-mail Address' => 'Budget Wrangler E-mail Address',
- 'Number of Anticipated Attendees' => 'Number of Anticipated Attendees',
- );
-
- $this->simulate_post_type( 'wordcamp' );
-
- switch_to_blog( BLOG_ID_CURRENT_SITE ); // central.wordcamp.org
-
- // Create the post
- $draft_id = wp_insert_post( array(
- 'post_type' => 'wordcamp',
- 'post_title' => 'WordCamp ' . $all_values['WordCamp City, State, Country'],
- 'post_status' => 'draft',
- 'post_author' => $this->get_user_id_from_username( $all_values['Lead Organizer WordPress.org Username'] ),
- ) );
-
- // Create the post meta
- if ( $draft_id ) {
- foreach ( $wordcamp_to_form_key_map as $wordcamp_key => $form_key ) {
- if ( ! empty( $all_values[ $form_key ] ) ) {
- update_post_meta( $draft_id, $wordcamp_key, $all_values[ $form_key ] );
- }
- }
- }
-
- restore_current_blog();
- }
-
- /**
- * Create a draft WordCamp post from a New Organizer Application submission.
- *
- * @param int $submission_id
- * @param array $all_values
- * @param array $extra_values
- */
- public function new_organizer_application( $submission_id, $all_values, $extra_values ) {
- if ( 'new-organizer-application' != $this->get_form_key( $submission_id ) ) {
- return;
- }
-
- $all_values = $this->get_unprefixed_grunion_form_values( $all_values );
- $wordcamp_to_form_key_map = array(
- 'Location' => 'Enter the city, state/province, and country where you would like to organize a WordCamp.',
- 'Organizer Name' => 'Lead Organizer Name',
- 'WordPress.org Username' => "Lead Organizer WordPress.org Username. This is the username you'd use to log in to http://wordpress.org/support/. If you don't have one, you can register on wordpress.org at https://wordpress.org/support/register.php",
- 'Email Address' => 'Lead Organizer Email',
- 'Number of Anticipated Attendees' => 'How many people do you think would attend?',
- );
-
- $this->simulate_post_type( 'wordcamp' );
-
- switch_to_blog( BLOG_ID_CURRENT_SITE ); // central.wordcamp.org
-
- // Create the post
- $draft_id = wp_insert_post( array(
- 'post_type' => 'wordcamp',
- 'post_title' => 'WordCamp ' . $all_values['Enter the city, state/province, and country where you would like to organize a WordCamp.'],
- 'post_status' => 'draft',
- 'post_author' => $this->get_user_id_from_username( $all_values["Lead Organizer WordPress.org Username. This is the username you'd use to log in to http://wordpress.org/support/. If you don't have one, you can register on wordpress.org at https://wordpress.org/support/register.php"] ),
- ) );
-
- // Create the post meta
- if ( $draft_id ) {
- foreach ( $wordcamp_to_form_key_map as $wordcamp_key => $form_key ) {
- if ( ! empty( $all_values[ $form_key ] ) ) {
- update_post_meta( $draft_id, $wordcamp_key, $all_values[ $form_key ] );
- }
- }
-
- $mailing_address = sprintf(
- "%s%s, %s %s\n%s",
- empty( $all_values['Lead Organizer Street Address'] ) ? '' : $all_values['Lead Organizer Street Address'] . "\n",
- $all_values['City'],
- $all_values['State/Province'],
- empty( $all_values['ZIP/Postal Code'] ) ? '' : $all_values['ZIP/Postal Code'],
- $all_values['Country']
- );
-
- update_post_meta( $draft_id, 'Mailing Address', $mailing_address );
- }
-
- restore_current_blog();
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Create a draft Sponsor post from a Call for Sponsors form submission.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo
</span></span></pre>
</div>
</div>
</body>
</html>