Index: rsvp.mailer.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rsvp/rsvp.mailer.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 rsvp.mailer.inc
--- rsvp.mailer.inc	27 Feb 2009 21:03:54 -0000	1.1.2.1
+++ rsvp.mailer.inc	26 Jan 2011 19:52:42 -0000
@@ -39,22 +39,131 @@ function rsvp_mailer_replacements($rsvp,
   );
   
   if (!is_null($invite_target)) {
+    $replacements['@guest_comment'] = check_plain($invite_target->comment);
     $replacements['@guest_name'] = rsvp_function_getGuestEmail($invite_target, true);
+    $replacements['@guest_response'] = $invite_target->response;
+    $replacements['@guest_totalguests'] = $invite_target->totalguests;
+    if (!empty($invite_target->old_response)) {
+      $replacements['@guest_comment_old'] = check_plain($invite_target->old_response->comment);
+      $replacements['@guest_response_old'] = $invite_target->old_response->response;
+      $replacements['@guest_response_raw_old'] = $invite_target->old_response->response;
+      $replacements['@guest_totalguests_old'] = $invite_target->old_response->totalguests;
+    }
+    else {
+      $replacements['@guest_comment_old'] = '';
+      $replacements['@guest_response_old'] = '';
+      $replacements['@guest_response_raw_old'] = '';
+      $replacements['@guest_totalguests_old'] = '';
+    }
   }
   else {
+    $replacements['@guest_comment'] = '';
+    $replacements['@guest_comment_old'] = '';
     $replacements['@guest_name'] = '';
+    $replacements['@guest_response'] = '';
+    $replacements['@guest_response_old'] = '';
+    $replacements['@guest_response_raw'] = '';
+    $replacements['@guest_response_raw_old'] = '';
+    $replacements['@guest_totalguests'] = '';
+    $replacements['@guest_totalguests_old'] = '';
   }
-  
+
   if (!is_null($rsvp)) {
   	$user = user_load($rsvp->uid);
     $replacements['@owner_name'] = check_plain($user->name);
     $replacements['@invitation_subject'] = check_plain($rsvp->name);
+
+    // Use the correct date formatting function depending on which module is
+    // being used.
+    if (variable_get('rsvp_connector', 'date') == 'date') {
+      // The full date using the system default format.
+      $replacements['@event_datetime'] = date_format_date($rsvp->startdate);
+      // Time fields broken out.
+      $replacements['@event_date_day'] = date_format_date($rsvp->startdate, 'custom', 'l');
+      $replacements['@event_date_month'] = date_format_date($rsvp->startdate, 'custom', 'F');
+      $replacements['@event_date_year'] = date_format_date($rsvp->startdate, 'custom', 'Y');
+      $replacements['@event_date_year_2'] = date_format_date($rsvp->startdate, 'custom', 'y');
+      $replacements['@event_date_year_4'] = date_format_date($rsvp->startdate, 'custom', 'Y');
+      // Time fields broken out.
+      $replacements['@event_time_12'] = date_format_date($rsvp->startdate, 'custom', 'g:ia');
+      $replacements['@event_time_24'] = date_format_date($rsvp->startdate, 'custom', 'G:i');
+      $replacements['@event_time_hours'] = date_format_date($rsvp->startdate, 'custom', 'g');
+      $replacements['@event_time_hours_12'] = date_format_date($rsvp->startdate, 'custom', 'g');
+      $replacements['@event_time_hours_24'] = date_format_date($rsvp->startdate, 'custom', 'G');
+      $replacements['@event_time_minutes'] = date_format_date($rsvp->startdate, 'custom', 'g:ia');
+      $replacements['@event_time_peroid'] = date_format_date($rsvp->startdate, 'custom', 'a');
+    }
+    elseif (variable_get('rsvp_connector', 'date') == 'event') {
+      // The full date using the system default format.
+      $replacements['@event_datetime'] = event_format_date($rsvp->startdate);
+      // Date fields broken out.
+      $replacements['@event_date_day'] = event_format_date($rsvp->startdate, 'custom', 'l');
+      $replacements['@event_date_month'] = event_format_date($rsvp->startdate, 'custom', 'F');
+      $replacements['@event_date_year'] = event_format_date($rsvp->startdate, 'custom', 'Y');
+      $replacements['@event_date_year_2'] = event_format_date($rsvp->startdate, 'custom', 'y');
+      $replacements['@event_date_year_4'] = event_format_date($rsvp->startdate, 'custom', 'Y');
+      // Time fields broken out.
+      $replacements['@event_time_12'] = event_format_date($rsvp->startdate, 'custom', 'g:ia');
+      $replacements['@event_time_24'] = event_format_date($rsvp->startdate, 'custom', 'G:i');
+      $replacements['@event_time_hours'] = event_format_date($rsvp->startdate, 'custom', 'g');
+      $replacements['@event_time_hours_12'] = event_format_date($rsvp->startdate, 'custom', 'g');
+      $replacements['@event_time_hours_24'] = event_format_date($rsvp->startdate, 'custom', 'G');
+      $replacements['@event_time_minutes'] = event_format_date($rsvp->startdate, 'custom', 'g:ia');
+      $replacements['@event_time_peroid'] = event_format_date($rsvp->startdate, 'custom', 'a');
+    }
+    else {
+      $replacements['@event_datetime'] = '';
+      $replacements['@event_date_day'] = '';
+      $replacements['@event_date_month'] = '';
+      $replacements['@event_date_year'] = '';
+      $replacements['@event_date_year_2'] = '';
+      $replacements['@event_date_year_4'] = '';
+      $replacements['@event_time_12'] = '';
+      $replacements['@event_time_24'] = '';
+      $replacements['@event_time_hours'] = '';
+      $replacements['@event_time_hours_12'] = '';
+      $replacements['@event_time_hours_24'] = '';
+      $replacements['@event_time_minutes'] = '';
+      $replacements['@event_time_peroid'] = '';
+    }
+
+    // Use the friendlier response names if available.
+    if (!is_null($invite_target)) {
+      foreach (array('@guest_response', '@guest_response_old') as $field) {
+        switch ($replacements[$field]) {
+          case 'yes':
+            $replacements[$field] = $rsvp->text_yes;
+            break;
+          case 'no':
+            $replacements[$field] = $rsvp->text_no;
+            break;
+          case 'maybe':
+            $replacements[$field] = $rsvp->text_maybe;
+            break;
+        }
+      }
+    }
   }
   else {
-    $replacements['@owner_name'] = '';
+    $replacements['@event_datetime'] = '';
+    $replacements['@event_date_day'] = '';
+    $replacements['@event_date_month'] = '';
+    $replacements['@event_date_year'] = '';
+    $replacements['@event_date_year_2'] = '';
+    $replacements['@event_date_year_4'] = '';
+    $replacements['@event_time_12'] = '';
+    $replacements['@event_time_24'] = '';
+    $replacements['@event_time_hours'] = '';
+    $replacements['@event_time_hours_12'] = '';
+    $replacements['@event_time_hours_24'] = '';
+    $replacements['@event_time_minutes'] = '';
+    $replacements['@event_time_peroid'] = '';
     $replacements['@invitation_subject'] = '';
+    $replacements['@node_body'] = '';
+    $replacements['@node_title'] = '';
+    $replacements['@owner_name'] = '';
   }
-  
+
   
   return $replacements;
 }