<!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>[672] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php: WordCamp Organizer Reminders: Abstract the sending of triggered e-mails.</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/672">672</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-06-04 21:47:11 +0000 (Wed, 04 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Organizer Reminders: Abstract the sending of triggered e-mails.
This avoids unnecessary duplication among the trigger callbacks.</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>
</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 (671 => 672)</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-04 21:31:48 UTC (rev 671)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2014-06-04 21:47:11 UTC (rev 672)
</span><span class="lines">@@ -378,31 +378,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
- $emails = $this->get_triggered_posts( 'wcor_added_to_schedule' );
-
- foreach( $emails as $email ) {
- $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
-
- if ( $this->validate_email_addresses( $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 ( is_array( $recipient ) && $this->send_individual_emails( $email->ID ) ) {
- foreach ( $recipient as $individual_recipient ) {
- $this->mail( $individual_recipient, $subject, $body );
- }
-
- $sent_email_ids[] = $email->ID;
- update_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', $sent_email_ids );
- } else {
- if ( $this->mail( $recipient, $subject, $body ) ) {
- $sent_email_ids[] = $email->ID;
- update_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', $sent_email_ids );
- }
- }
- }
- }
</del><ins>+ $this->send_triggered_emails( $wordcamp, 'wcor_added_to_schedule' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -411,11 +387,26 @@
</span><span class="cx"> * This fires when an application is approved and the lead organizer's WordPress.org account
</span><span class="cx"> * is added as a Contributor to central.wordcamp.org.
</span><span class="cx"> *
</span><ins>+ * wcor_organizer_added_to_central is only triggered when the organizer has successfully been
+ * added to Central, so we don't need to do any precondition checks like other trigger callbacks.
+ *
</ins><span class="cx"> * @param WP_Post $wordcamp
</span><span class="cx"> */
</span><span class="cx"> public function send_trigger_organizer_added_to_central( $wordcamp ) {
</span><del>- $emails = $this->get_triggered_posts( 'wcor_organizer_added_to_central' );
</del><ins>+ $this->send_triggered_emails( $wordcamp, 'wcor_organizer_added_to_central' );
+ }
+
+ /**
+ * Send emails associated with the given trigger.
+ *
+ * This will save a record of which e-mails have already been sent and avoid sending duplicates.
+ *
+ * @param WP_Post $wordcamp
+ * @param string $trigger
+ */
+ protected function send_triggered_emails( $wordcamp, $trigger ) {
</ins><span class="cx"> $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
</span><ins>+ $emails = $this->get_triggered_posts( $trigger );
</ins><span class="cx">
</span><span class="cx"> foreach( $emails as $email ) {
</span><span class="cx"> $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
</span><span class="lines">@@ -424,9 +415,18 @@
</span><span class="cx"> $subject = $this->replace_placeholders( $wordcamp, $email, $email->post_title );
</span><span class="cx"> $body = $this->replace_placeholders( $wordcamp, $email, $email->post_content );
</span><span class="cx">
</span><del>- if ( $this->mail( $recipient, $subject, $body ) ) {
</del><ins>+ if ( is_array( $recipient ) && $this->send_individual_emails( $email->ID ) ) {
+ foreach ( $recipient as $individual_recipient ) {
+ $this->mail( $individual_recipient, $subject, $body );
+ }
+
</ins><span class="cx"> $sent_email_ids[] = $email->ID;
</span><span class="cx"> update_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', $sent_email_ids );
</span><ins>+ } else {
+ 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>
</div>
</body>
</html>