<!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>[680] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders: WordCamp Organizer Reminders: Add button for manually sending an e-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/680">680</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-06-06 01:10:40 +0000 (Fri, 06 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Organizer Reminders: Add button for manually sending an e-mail.</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 (679 => 680)</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 22:51:21 UTC (rev 679)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php 2014-06-06 01:10:40 UTC (rev 680)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> $replace = array(
</span><span class="cx"> // The WordCamp
</span><span class="cx"> $wordcamp->post_title,
</span><del>- date( 'l, F jS, Y', $wordcamp_meta['Start Date (YYYY-mm-dd)'][0] ),
</del><ins>+ empty( $wordcamp_meta['Start Date (YYYY-mm-dd)'][0] ) ? '' : date( 'l, F jS, Y', $wordcamp_meta['Start Date (YYYY-mm-dd)'][0] ),
</ins><span class="cx"> $wordcamp_meta['Location'][0],
</span><span class="cx"> esc_url( $wordcamp_meta['URL'][0] ),
</span><span class="cx"> esc_url( admin_url( 'post.php?post=' . $wordcamp->ID . '&action=edit' ) ),
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> esc_url( 'https://twitter.com/' . $wordcamp_meta['Twitter'][0] ),
</span><span class="cx"> esc_url( 'https://twitter.com/hashtag/' . $wordcamp_meta['WordCamp Hashtag'][0] ),
</span><span class="cx"> absint( $wordcamp_meta['Number of Anticipated Attendees'][0] ),
</span><del>- get_term( $wordcamp_meta['Multi-Event Sponsor Region'][0], MES_Sponsor::REGIONS_SLUG )->name,
</del><ins>+ empty( $wordcamp_meta['Multi-Event Sponsor Region'][0] ) ? '' : get_term( $wordcamp_meta['Multi-Event Sponsor Region'][0], MES_Sponsor::REGIONS_SLUG )->name,
</ins><span class="cx">
</span><span class="cx"> // The organizing team
</span><span class="cx"> $wordcamp_meta['Organizer Name'][0],
</span><span class="lines">@@ -246,6 +246,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+
+ *
+ * @param WP_Post $email
+ * @param WP_Post $wordcamp
+ * @return bool
+ */
+ public function send_manual_email( $email, $wordcamp ) {
+ $recipient = $this->get_recipient( $wordcamp->ID, $email->ID );
+
+ return $this->mail( $recipient, $email->post_title, $email->post_content, array(), $email, $wordcamp );
+ }
+
+ /**
</ins><span class="cx"> * Send e-mails that are scheduled to go out at a specific time (e.g., 3 days before the camp)
</span><span class="cx"> */
</span><span class="cx"> public function send_timed_emails() {
</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 (679 => 680)</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-05 22:51:21 UTC (rev 679)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-reminder.php 2014-06-06 01:10:40 UTC (rev 680)
</span><span class="lines">@@ -68,6 +68,14 @@
</span><span class="cx"> 'normal',
</span><span class="cx"> 'high'
</span><span class="cx"> );
</span><ins>+
+ add_meta_box(
+ 'wcor_manually_send',
+ __( 'Manually Send', 'wordcamporg' ),
+ array( $this, 'markup_manually_send' ),
+ self::POST_TYPE_SLUG,
+ 'side'
+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -75,7 +83,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object $post
</span><span class="cx"> */
</span><del>- public static function markup_reminder_details( $post ) {
</del><ins>+ public function markup_reminder_details( $post ) {
</ins><span class="cx"> $send_where = get_post_meta( $post->ID, 'wcor_send_where', true );
</span><span class="cx"> $send_custom_address = get_post_meta( $post->ID, 'wcor_send_custom_address', true );
</span><span class="cx"> $send_when = get_post_meta( $post->ID, 'wcor_send_when', true );
</span><span class="lines">@@ -190,6 +198,123 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Builds the markup for the Manually Send metabox
+ *
+ * @param object $post
+ */
+ public function markup_manually_send( $post ) {
+ $wordcamps = $this->get_all_wordcamps();
+ ?>
+
+ <p><?php _e( 'Check the box below and save the post to manually send this message to the assigned recipient(s), using the data from the selected WordCamp.', 'wordcamporg' ); ?></p>
+
+ <p><?php _e( 'It will be sent immediately, regardless of when it is scheduled to be sent automatically, and regardless of whether or not it has already been sent automatically.', 'wordcamporg' ); ?></p>
+
+ <p>
+ <select name="wcor_manually_send_wordcamp">
+ <option value="instructions"><?php _e( 'Select a WordCamp', 'wordcamporg' ); ?></option>
+ <?php /* translators: label for a spacer <option> at the beginning of a <select> */ ?>
+ <option value="spacer"><?php _e( '- - -', 'wordcamporg' ); ?></option>
+
+ <?php foreach ( $wordcamps as $wordcamp ) : ?>
+ <option value="<?php echo esc_attr( $wordcamp->ID ); ?>">
+ [<?php echo esc_html( $wordcamp->meta['sort_column'] ); ?>]
+ <?php echo esc_html( $wordcamp->post_title ); ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ </p>
+
+ <p>
+ <input id="wcor_manually_send_checkbox" name="wcor_manually_send" type="checkbox">
+ <label for="wcor_manually_send_checkbox"><?php _e( 'Manually send this e-mail', 'wordcamporg' ); ?></label>
+ </p>
+
+ <?php
+ }
+
+ /**
+ * Retrieve all WordCamps and their metadata, sorted by status and year.
+ *
+ * @return array
+ */
+ protected function get_all_wordcamps() {
+ if ( $wordcamps = get_transient( 'wcor_get_all_wordcamps' ) ) {
+ return $wordcamps;
+ }
+
+ $wordcamps = get_posts( array(
+ 'post_type' => WCPT_POST_TYPE_ID,
+ 'post_status' => array( 'draft', 'pending', 'publish' ),
+ 'numberposts' => -1,
+ ) );
+
+ foreach ( $wordcamps as &$wordcamp ) {
+ $wordcamp->meta = get_post_custom( $wordcamp->ID );
+ $wordcamp->meta['sort_column'] = empty( $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] ) ? $wordcamp->post_status : date( 'Y', $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] );
+ }
+
+ usort( $wordcamps, array( $this, 'usort_wordcamps_by_year_and_status' ) );
+
+ set_transient( 'wcor_get_all_wordcamps', $wordcamps, HOUR_IN_SECONDS );
+
+ return $wordcamps;
+ }
+
+ /**
+ * Sort WordCamps by year and post status.
+ *
+ * This is a usort() callback.
+ *
+ * WordCamps without a start date should be listed first, followed by WordCamps with a start date.
+ *
+ * Within the set that does not have a start date, they should be sorted by status; first drafts, then pending,
+ * then published. Those with the same status should be sorted alphabetically.
+ *
+ * Within the set that does have a start date, they should be sorted by year, descending. Those within the same
+ * year should be sorted alphabetically.
+ *
+ * Example:
+ *
+ * 1) draft missing start date, titled "WordCamp Atlanta"
+ * 2) draft missing start date, titled "WordCamp Chicago"
+ * 3) pending missing start date, titled "WordCamp Seattle"
+ * 4) publish missing start date, titled "WordCamp Portland"
+ * 5) publish in year 2014, titled "WordCamp Dayton"
+ * 6) publish in year 2014, titled "WordCamp San Francisco"
+ * 7) publish in year 2013, titled "WordCamp Boston"
+ * 8) publish in year 2013, titled "WordCamp Columbus"
+ *
+ * @param WP_Post $a
+ * @param WP_Post $b
+ * @return int
+ */
+ protected function usort_wordcamps_by_year_and_status( $a, $b ) {
+ $a_year = empty( $a->meta['Start Date (YYYY-mm-dd)'][0] ) ? false : date( 'Y', $a->meta['Start Date (YYYY-mm-dd)'][0] );
+ $b_year = empty( $b->meta['Start Date (YYYY-mm-dd)'][0] ) ? false : date( 'Y', $b->meta['Start Date (YYYY-mm-dd)'][0] );
+
+ $status_weights = array(
+ 'draft' => 3,
+ 'pending' => 2,
+ 'publish' => 1,
+ );
+
+ if ( empty( $a_year ) || empty( $b_year ) ) {
+ if ( $a->post_status == $b->post_status ) {
+ return $a->post_title < $b->post_title;
+ } else {
+ return $status_weights[ $a->post_status ] < $status_weights[ $b->post_status ];
+ }
+ } else {
+ if ( date( 'Y', $a->meta['Start Date (YYYY-mm-dd)'][0] ) == date( 'Y', $b->meta['Start Date (YYYY-mm-dd)'][0] ) ) {
+ return $a->post_title > $b->post_title;
+ } else {
+ return $a_year < $b_year;
+ }
+ }
+ }
+
+ /**
</ins><span class="cx"> * Checks to make sure the conditions for saving post meta are met
</span><span class="cx"> *
</span><span class="cx"> * @param int $post_id
</span><span class="lines">@@ -211,6 +336,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->save_post_meta( $post, $_POST );
</span><ins>+ $this->send_manual_email( $post, $_POST );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -250,4 +376,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Sends an e-mail manually.
+ *
+ * This provides a way to send e-mails at will, regardless of the time or trigger that the e-mail is normally
+ * associated with, and regardless of whether or not the e-mail has already been sent to the recipient.
+ *
+ * @todo Add admin notices, but it's a pain to make them persist through the post/redirect/get process.
+ * Will be easy if #11515 lands in Core.
+ *
+ * @param WP_Post $email
+ * @param array $form_values
+ */
+ protected function send_manual_email( $email, $form_values ) {
+ /** @var $WCOR_Mailer WCOR_Mailer */
+ global $WCOR_Mailer;
+
+ if ( empty( $form_values['wcor_manually_send'] ) || 'on' != $form_values['wcor_manually_send'] || in_array( $form_values['wcor_manually_send_wordcamp'], array( 'instructions', 'spacer' ) ) ) {
+ return;
+ }
+
+ $wordcamp = get_post( $form_values['wcor_manually_send_wordcamp'] );
+ $WCOR_Mailer->send_manual_email( $email, $wordcamp );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>