<!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>[666] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders: WordCamp Organizer Reminders: Change definition of 'added to schedule' trigger.</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">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/666">666</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-06-03 22:42:04 +0000 (Tue, 03 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Organizer Reminders: Change definition of 'added to schedule' trigger.
Previously it was defined as when a published `wordcamp` post added their start date. Now we're defining it as when
a camp moves from the 'pending' status to 'publish'. This makes it more consistent with current practices (e.g.,
the start date and other meta fields are required before a camp is allowed to go from pending to publish.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamporganizerreminderswcormailerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamporganizerreminderswcorreminderphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamporganizerreminderswcormailerphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php (665 => 666)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2014-06-03 22:20:42 UTC (rev 665)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2014-06-03 22:42:04 UTC (rev 666)
</span><span class="lines">@@ -16,10 +16,10 @@
</span><span class="cx"> 'name' => 'WordCamp Added to schedule',
</span><span class="cx"> 'actions' => array(
</span><span class="cx"> array(
</span><del>- 'name' => 'post_updated',
</del><ins>+ 'name' => 'transition_post_status',
</ins><span class="cx"> 'callback' => 'send_trigger_added_to_schedule',
</span><span class="cx"> 'priority' => 10,
</span><del>- 'parameters' => 2,
</del><ins>+ 'parameters' => 3,
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="lines">@@ -283,36 +283,34 @@
</span><span class="cx"> /**
</span><span class="cx"> * Sends e-mails hooked to the wcor_added_to_schedule trigger.
</span><span class="cx"> *
</span><del>- * This fires when a WordCamp is added to the schedule (i.e., when they set the start date in their `wordcamp` post).
</del><ins>+ * This fires when a WordCamp is added to the schedule (i.e., when their `wordcamp` post goes from 'draft' to 'publish').
</ins><span class="cx"> *
</span><del>- * Since Core doesn't support revisions on post meta, we're not actually checking to see if the start date was added during
- * the current post update, but just that it has a start data. By itself, that would lead to the e-mail being sent every time
- * the post is updated, but to avoid that we're checking the `wcor_sent_email_id` post meta for the `wordcamp` post to see if
- * we've already sent this particular e-mail to this WordCamp in the past.
- *
- * @param int $post_id
- * @param WP_Post $post
</del><ins>+ * @param string $new_status
+ * @param string $old_status
+ * @param WP_Post $wordcamp
</ins><span class="cx"> */
</span><del>- public function send_trigger_added_to_schedule( $post_id, $post ) {
- if ( 'wordcamp' == $post->post_type && 'publish' == $post->post_status ) {
- $start_date = get_post_meta( $post_id, 'Start Date (YYYY-mm-dd)', true );
- $sent_email_ids = (array) get_post_meta( $post_id, 'wcor_sent_email_ids', true );
</del><ins>+ public function send_trigger_added_to_schedule( $new_status, $old_status, $wordcamp ) {
+ if ( empty( $wordcamp->post_type ) || WCPT_POST_TYPE_ID != $wordcamp->post_type ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- if ( $start_date ) {
- $emails = $this->get_triggered_posts( 'wcor_added_to_schedule' );
</del><ins>+ if ( 'pending' != $old_status || 'publish' != $new_status ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- foreach( $emails as $email ) {
- $recipient = $this->get_recipient( $post->ID, $email->ID );
</del><ins>+ $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
+ $emails = $this->get_triggered_posts( 'wcor_added_to_schedule' );
</ins><span class="cx">
</span><del>- if ( is_email( $recipient ) && ! in_array( $email->ID, $sent_email_ids ) ) {
- $subject = $this->replace_placeholders( $post, $email, $email->post_title );
- $body = $this->replace_placeholders( $post, $email, $email->post_content );
</del><ins>+ foreach( $emails as $email ) {
+ $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
</ins><span class="cx">
</span><del>- if ( $this->mail( $recipient, $subject, $body ) ) {
- $sent_email_ids[] = $email->ID;
- update_post_meta( $post_id, 'wcor_sent_email_ids', $sent_email_ids );
- }
- }
</del><ins>+ if ( is_email( $recipient ) && ! in_array( $email->ID, $sent_email_ids ) ) {
+ $subject = $this->replace_placeholders( $wordcamp, $email, $email->post_title );
+ $body = $this->replace_placeholders( $wordcamp, $email, $email->post_content );
+
+ if ( $this->mail( $recipient, $subject, $body ) ) {
+ $sent_email_ids[] = $email->ID;
+ update_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', $sent_email_ids );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamporganizerreminderswcorreminderphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php (665 => 666)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php 2014-06-03 22:20:42 UTC (rev 665)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php 2014-06-03 22:42:04 UTC (rev 666)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> <li>[organizer_name]</li>
</span><span class="cx"> <li>[organizer_address]</li>
</span><span class="cx"> <li>[edit_wordcamp_url]</li>
</span><ins>+ <li>[lead_organizer_username]</li>
</ins><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>