<!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>[128] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders: WordCamp Organizer Reminders: Add ability to send e-mail to custom address.</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/128">128</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2013-11-25 22:31:23 +0000 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Organizer Reminders: Add ability to send e-mail to custom address.</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 (127 => 128)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2013-11-19 17:44:28 UTC (rev 127)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2013-11-25 22:31:23 UTC (rev 128)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sends e-mails at time-based intervals and triggers
</del><ins>+ * Sends e-mails at time-based intervals and on triggers
</ins><span class="cx"> * @package WordCampOrganizerReminders
</span><span class="cx"> */
</span><span class="cx"> class WCOR_Mailer {
</span><span class="lines">@@ -108,16 +108,23 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> foreach ( $recent_or_upcoming_wordcamps as $wordcamp ) {
</span><del>- $organizers_email = get_post_meta( $wordcamp->ID, 'E-mail Address', true );
- $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
</del><ins>+ $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
</ins><span class="cx">
</span><del>- if ( ! is_email( $organizers_email ) ) {
- continue;
- }
-
</del><span class="cx"> foreach ( $reminder_emails as $email ) {
</span><ins>+ $send_where = get_post_meta( $email->ID, 'wcor_send_where', true );
+
+ if ( 'wcor_send_custom' == $send_where ) {
+ $recipient = get_post_meta( $email->ID, 'wcor_send_custom_address', true );
+ } else {
+ $recipient = get_post_meta( $wordcamp->ID, 'E-mail Address', true );
+ }
+
+ if ( ! is_email( $recipient ) ) {
+ continue;
+ }
+
</ins><span class="cx"> if ( $this->timed_email_is_ready_to_send( $wordcamp, $email, $sent_email_ids ) ) {
</span><del>- if ( $this->mail( $organizers_email, $email->post_title, $email->post_content ) ) {
</del><ins>+ if ( $this->mail( $recipient, $email->post_title, $email->post_content ) ) {
</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><span class="lines">@@ -206,11 +213,10 @@
</span><span class="cx"> */
</span><span class="cx"> public function send_trigger_added_to_schedule( $post_id, $post ) {
</span><span class="cx"> if ( 'wordcamp' == $post->post_type && 'publish' == $post->post_status ) {
</span><del>- $start_date = get_post_meta( $post_id, 'Start Date (YYYY-mm-dd)', true );
- $organizers_email = get_post_meta( $post_id, 'E-mail Address', true );
- $sent_email_ids = (array) get_post_meta( $post_id, 'wcor_sent_email_ids', true );
</del><ins>+ $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 );
</ins><span class="cx">
</span><del>- if ( $start_date && is_email( $organizers_email ) ) {
</del><ins>+ if ( $start_date ) {
</ins><span class="cx"> $emails = get_posts( array(
</span><span class="cx"> 'posts_per_page' => -1,
</span><span class="cx"> 'post_type' => WCOR_Reminder::POST_TYPE_SLUG,
</span><span class="lines">@@ -227,8 +233,16 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> foreach( $emails as $email ) {
</span><del>- if ( ! in_array( $email->ID, $sent_email_ids ) ) {
- if ( $this->mail( $organizers_email, $email->post_title, $email->post_content ) ) {
</del><ins>+ $send_where = get_post_meta( $email->ID, 'wcor_send_where', true );
+
+ if ( 'wcor_send_custom' == $send_where ) {
+ $recipient = get_post_meta( $email->ID, 'wcor_send_custom_address', true );
+ } else {
+ $recipient = get_post_meta( $post_id, 'E-mail Address', true );
+ }
+
+ if ( is_email( $recipient ) && ! in_array( $email->ID, $sent_email_ids ) ) {
+ if ( $this->mail( $recipient, $email->post_title, $email->post_content ) ) {
</ins><span class="cx"> $sent_email_ids[] = $email->ID;
</span><span class="cx"> update_post_meta( $post_id, 'wcor_sent_email_ids', $sent_email_ids );
</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 (127 => 128)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php 2013-11-19 17:44:28 UTC (rev 127)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php 2013-11-25 22:31:23 UTC (rev 128)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> 'Reminder Details',
</span><span class="cx"> array( $this, 'markup_reminder_details' ),
</span><span class="cx"> self::POST_TYPE_SLUG,
</span><del>- 'side',
- 'default'
</del><ins>+ 'normal',
+ 'high'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,14 +76,34 @@
</span><span class="cx"> * @param object $post
</span><span class="cx"> */
</span><span class="cx"> public static function markup_reminder_details( $post ) {
</span><del>- $send_when = get_post_meta( $post->ID, 'wcor_send_when', true );
- $send_days_before = get_post_meta( $post->ID, 'wcor_send_days_before', true );
- $send_days_after = get_post_meta( $post->ID, 'wcor_send_days_after', true );
- $which_trigger = get_post_meta( $post->ID, 'wcor_which_trigger', true );
</del><ins>+ $send_where = get_post_meta( $post->ID, 'wcor_send_where', true );
+ $send_custom_address = get_post_meta( $post->ID, 'wcor_send_custom_address', true );
+ $send_when = get_post_meta( $post->ID, 'wcor_send_when', true );
+ $send_days_before = get_post_meta( $post->ID, 'wcor_send_days_before', true );
+ $send_days_after = get_post_meta( $post->ID, 'wcor_send_days_after', true );
+ $which_trigger = get_post_meta( $post->ID, 'wcor_which_trigger', true );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><ins>+
+ <h4>Who should this e-mail be sent to?</h4>
+
+ <table>
+ <tbody>
+ <tr>
+ <th><input id="wcor_send_where" name="wcor_send_where" type="radio" value="wcor_send_organizers" <?php checked( $send_where, 'wcor_send_organizers' ); ?>></th>
+ <td colspan="2"><label for="wcor_send_where">The organizers of the WordCamp</label></td>
+ </tr>
+
+ <tr>
+ <th><input id="wcor_send_custom" name="wcor_send_where" type="radio" value="wcor_send_custom" <?php checked( $send_where, 'wcor_send_custom' ); ?>></th>
+ <td><label for="wcor_send_custom">A custom address: </label></td>
+ <td><input id="wcor_send_custom_address" name="wcor_send_custom_address" type="text" class="regular-text" value="<?php echo esc_attr( $send_custom_address ); ?>" /></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx">
</span><del>- <p>When should this e-mail be sent?</p>
</del><ins>+
+ <h4>When should this e-mail be sent?</h4>
</ins><span class="cx">
</span><span class="cx"> <table>
</span><span class="cx"> <tbody>
</span><span class="lines">@@ -107,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> <tr>
</span><span class="cx"> <th><input id="wcor_send_trigger" name="wcor_send_when" type="radio" value="wcor_send_trigger" <?php checked( $send_when, 'wcor_send_trigger' ); ?>></th>
</span><del>- <td><label for="wcor_send_trigger">on trigger: </label></td>
</del><ins>+ <td><label for="wcor_send_trigger">on a trigger: </label></td>
</ins><span class="cx"> <td>
</span><span class="cx"> <select name="wcor_which_trigger">
</span><span class="cx"> <option value="null" <?php selected( $which_trigger, false ); ?>></option>
</span><span class="lines">@@ -155,6 +175,16 @@
</span><span class="cx"> * @param array $new_meta
</span><span class="cx"> */
</span><span class="cx"> protected function save_post_meta( $post, $new_meta ) {
</span><ins>+ if ( isset( $new_meta['wcor_send_where'] ) ) {
+ if ( in_array( $new_meta['wcor_send_where'], array( 'wcor_send_organizers', 'wcor_send_custom' ) ) ) {
+ update_post_meta( $post->ID, 'wcor_send_where', $new_meta['wcor_send_where'] );
+ }
+ }
+
+ if ( isset( $new_meta['wcor_send_custom_address'] ) && is_email( $new_meta['wcor_send_custom_address'] ) ) {
+ update_post_meta( $post->ID, 'wcor_send_custom_address', sanitize_email( $new_meta['wcor_send_custom_address'] ) );
+ }
+
</ins><span class="cx"> if ( isset( $new_meta['wcor_send_when'] ) ) {
</span><span class="cx"> if ( in_array( $new_meta['wcor_send_when'], array( 'wcor_send_before', 'wcor_send_after', 'wcor_send_trigger' ) ) ) {
</span><span class="cx"> update_post_meta( $post->ID, 'wcor_send_when', $new_meta['wcor_send_when'] );
</span></span></pre>
</div>
</div>
</body>
</html>