Changeset 2898 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php

Timestamp:

04/05/2016 04:05:02 PM (10 years ago)

Author:

kovshenin

Message:

WordCamp.org: Reintegrate application-tracking branch into trunk.

Location:

sites/trunk/wordcamp.org

Files:

• . (modified) (1 prop)
• public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php (modified) (16 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-organizer-reminders/wcor-mailer.php

@@ -7 +7 @@
 class WCOR_Mailer {
         public $triggers;
-        
+
         /**
          * Constructor
@@ -61 +61 @@
                         ),
                 );
-                
+
                 add_action( 'wcor_send_timed_emails', array( $this, 'send_timed_emails' ) );
-                
+
                 foreach ( $this->triggers as $trigger_id => $trigger ) {
                         foreach( $trigger['actions'] as $action ) {
@@ -72 +72 @@
 
         /**
-         * Schedule cron job when plugin is activated  
+         * Schedule cron job when plugin is activated
          */
         public function activate() {
@@ -83 +83 @@
                 }
         }
-        
+
         /**
          * Clear cron job when plugin is deactivated
@@ -94 +94 @@
          * Wrapper for wp_mail() that customizes the subject, body and headers
          *
-         * We want to make sure that replies go to support@wordcamp.org, rather than the fake address that WordPress sends from, but 
+         * We want to make sure that replies go to support@wordcamp.org, rather than the fake address that WordPress sends from, but
          * we don't want to be flagged as spam for forging the From header, so we set the Sender header.
          * @see http://stackoverflow.com/q/4728393/450127
@@ -213 +213 @@
                         '[safety_wrangler_name]',
                         '[safety_wrangler_email]',
-                        
+
                         // Venue
                         '[venue_name]',
@@ -287 +287 @@
                         $this->get_mes_info( $wordcamp->ID ),
                 );
-                
+
                 return str_replace( $search, $replace, $content );
         }
@@ -454 +454 @@
                 return $this->mail( $recipient, $email->post_title, $email->post_content, array(), $email, $wordcamp );
         }
-        
+
         /**
          * Send e-mails that are scheduled to go out at a specific time (e.g., 3 days before the camp)
@@ -462 +462 @@
                         'posts_per_page'  => -1,
                         'post_type'       => 'wordcamp',
+                        'post_status'     => WordCamp_Loader::get_public_post_statuses(),
                         'meta_query'      => array(
                                 array(
@@ -474 +475 @@
                         'posts_per_page'  => -1,
                         'post_type'       => WCPT_POST_TYPE_ID,
-                        'post_status'     => 'pending',
+                        'post_status'     => WordCamp_Loader::get_pre_planning_post_statuses(),
                 ) );
 
@@ -490 +491 @@
                         ),
                 ) );
-                
+
                 foreach ( $wordcamps as $wordcamp ) {
                         $sent_email_ids = (array) get_post_meta( $wordcamp->ID, 'wcor_sent_email_ids', true );
@@ -496 +497 @@
                         foreach ( $reminder_emails as $email ) {
                                 $recipient = $this->get_recipients( $wordcamp->ID, $email->ID );
-                                
+
                                 if ( $this->timed_email_is_ready_to_send( $wordcamp, $email, $sent_email_ids ) ) {
                                         if ( $this->mail( $recipient, $email->post_title, $email->post_content, array(), $email, $wordcamp ) ) {
@@ -520 +521 @@
          * @todo It'd be nice to have some unit tests for this function, since there are a lot of different cases, but it seems like that might be
          * hard to do because of having to mock get_post_meta(), current_time(), etc. We could pass that info in, but that doesn't seem very elegant.
-         *       
+         *
          * @param WP_Post $wordcamp
          * @param WP_Post $email
@@ -544 +545 @@
                         if ( 'wcor_send_before' == $send_when ) {
                                 $days_before = absint( get_post_meta( $email->ID, 'wcor_send_days_before', true ) );
-                                
+
                                 if ( $start_date && $days_before ) {
                                         $send_date = $start_date - ( $days_before * DAY_IN_SECONDS );
-                                        
+
                                         if ( $send_date <= current_time( 'timestamp' ) ) {
                                                 $ready = true;
@@ -557 +558 @@
                                 if ( $end_date && $days_after ) {
                                         $send_date = $end_date + ( $days_after * DAY_IN_SECONDS );
-                                        
+
                                         if ( $send_date <= current_time( 'timestamp' ) ) {
                                                 $ready = true;
@@ -575 +576 @@
                         }
                 }
-                
+
                 return $ready;
         }