<!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>[679] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php: WordCamp Organizer Reminders: Refactor mail logic out of callers and into mail().</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/679">679</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-06-05 22:51:21 +0000 (Thu, 05 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Organizer Reminders: Refactor mail logic out of callers and into mail().
Some of the logic container in functions that call mail() is duplicated, and also is more appropriate to be handled
in mail() itself. This keeps the callers more lean and maintainable.
This will also make it easier to add extra types of callers, like one to manually send an email.</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 (678 => 679)</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-05 21:51:53 UTC (rev 678)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2014-06-05 22:51:21 UTC (rev 679)
</span><span class="lines">@@ -88,18 +88,39 @@
</span><span class="cx"> * @param string $to
</span><span class="cx"> * @param string $subject
</span><span class="cx"> * @param string $body
</span><ins>+ * @param array $headers
+ * @param WP_Post $email
+ * @param WP_Post $wordcamp
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>- protected function mail( $to, $subject, $body ) {
</del><ins>+ protected function mail( $to, $subject, $body, $headers = array(), $email, $wordcamp ) {
+ if ( ! $this->validate_email_addresses( $to ) ) {
+ return false;
+ }
+
+ $status = true;
+ $subject = $this->replace_placeholders( $wordcamp, $email, $subject );
+ $body = $this->replace_placeholders( $wordcamp, $email, $body );
</ins><span class="cx"> $subject = html_entity_decode( strip_tags( $subject ), ENT_QUOTES, 'UTF-8' );
</span><span class="cx"> $body = html_entity_decode( strip_tags( $body ), ENT_QUOTES, 'UTF-8' );
</span><del>- $headers = array(
</del><ins>+
+ $headers = array_merge( $headers, array(
</ins><span class="cx"> 'From: WordCamp Central <support@wordcamp.org>',
</span><span class="cx"> 'Sender: wordpress@' . strtolower( $_SERVER['SERVER_NAME'] ),
</span><span class="cx"> 'CC: support@wordcamp.org',
</span><del>- );
-
- return wp_mail( $to, $subject, $body, $headers );
</del><ins>+ ) );
+
+ if ( is_array( $to ) && $this->send_individual_emails( $email->ID ) ) {
+ foreach ( $to as $individual_recipient ) {
+ if ( ! wp_mail( $individual_recipient, $subject, $body, $headers ) ) {
+ $status = false;
+ }
+ }
+ } else {
+ $status = wp_mail( $to, $subject, $body, $headers );
+ }
+
+ return $status;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -258,20 +279,11 @@
</span><span class="cx"> foreach ( $reminder_emails as $email ) {
</span><span class="cx"> $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
</span><span class="cx">
</span><del>- if ( ! $this->validate_email_addresses( $recipient ) ) {
- continue;
- }
-
</del><span class="cx"> if ( $this->timed_email_is_ready_to_send( $wordcamp, $email, $sent_email_ids ) ) {
</span><del>- $subject = $this->replace_placeholders( $wordcamp, $email, $email->post_title );
- $body = $this->replace_placeholders( $wordcamp, $email, $email->post_content );
-
- if ( $this->mail( $recipient, $subject, $body ) ) {
</del><ins>+ if ( $this->mail( $recipient, $email->post_title, $email->post_content, array(), $email, $wordcamp ) ) {
</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><span class="cx"> }
</span><del>-
- sleep( 1 ); // don't send e-mails too fast, or it might increase the risk of being flagged as spam
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -437,22 +449,10 @@
</span><span class="cx"> foreach( $emails as $email ) {
</span><span class="cx"> $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
</span><span class="cx">
</span><del>- 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 );
- }
-
</del><ins>+ if ( ! in_array( $email->ID, $sent_email_ids ) ) {
+ if ( $this->mail( $recipient, $email->post_title, $email->post_content, array(), $email, $wordcamp ) ) {
</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><del>- } 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><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>