Index: rsvp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rsvp/rsvp.module,v
retrieving revision 1.22.2.35
diff -u -p -r1.22.2.35 rsvp.module
--- rsvp.module	29 Jul 2009 15:51:45 -0000	1.22.2.35
+++ rsvp.module	21 Sep 2009 14:07:55 -0000
@@ -72,7 +72,57 @@ function rsvp_theme($existing, $type, $t
       'template' => 'themes/default/rsvp-guestlist-block',
       'arguments' => array('connector' => NULL, 'rsvp' => NULL, 'invite_target' => NULL, 'params' => NULL),
     ),
-    
+		
+		'rsvp_invitation_mail_body' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-invitation-mail-body',
+    ),
+
+		'rsvp_invitation_mail_subject' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-invitation-mail-subject',
+    ),
+		
+		'rsvp_message_mail_body' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-message-mail-body',
+    ),
+
+		'rsvp_message_mail_subject' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-message-mail-subject',
+    ),
+		
+		'rsvp_notification_guest_mail_body' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-notification-guest-mail-body',
+    ),
+
+		'rsvp_notification_guest_mail_subject' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-notification-guest-mail-subject',
+    ),
+		
+		'rsvp_notification_moderator_mail_body' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-notification-moderator-mail-body',
+    ),
+
+		'rsvp_notification_moderator_mail_subject' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-notification-moderator-mail-subject',
+    ),
+		
+		'rsvp_cancel_mail_body' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-cancel-mail-body',
+    ),
+
+		'rsvp_cancel_mail_subject' => array(
+      'theme paths' => array(file_directory_path()),
+      'template' => 'themes/default/mail/rsvp-cancel-mail-subject',
+    ),
+		    
   );
 }
@@ -3853,8 +3905,8 @@ function rsvp_mail($key, &$message, $rep
 
   //all replacements are already sanitized. Use strtr instead of t() because the @ character in the replacemanets keys
   //would transform the values.
-  $message['subject'] = strtr(variable_get("rsvp_default_mailer_{$key}_subject", $defaults['subject']), $replacements);
-  $message['body']    = strtr(variable_get("rsvp_default_mailer_{$key}_message", $defaults['message']), $replacements);
+  $message['subject'] = strtr($defaults['subject'], $replacements);
+  $message['body']    = strtr($defaults['message'], $replacements);
 	
 }
Index: themes/default/rsvp-cancel-mail-body.tpl.php
===================================================================
RCS file: rsvp-cancel-mail-body.tpl.php
diff -N rsvp-cancel-mail-body.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-cancel-mail-body.tpl.php	21 Sep 2009 14:21:15 -0000
@@ -0,0 +1,29 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-message.tpl.php
+ * Template for the plain text invitation email body
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+Dear @guest_name,
+
+@owner_name has canceled his invitation.
+
+Regards,
+@sender_name
\ No newline at end of file
Index: themes/default/rsvp-cancel-mail-subject.tpl.php
===================================================================
RCS file: rsvp-cancel-mail-subject.tpl.php
diff -N rsvp-cancel-mail-subject.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-cancel-mail-subject.tpl.php	21 Sep 2009 14:21:15 -0000
@@ -0,0 +1,24 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-subject.tpl.php
+ * Template for the invitation email subject
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+[@site] Invitation - @invitation_subject
\ No newline at end of file
Index: themes/default/rsvp-invitation-mail-body.tpl.php
===================================================================
RCS file: rsvp-invitation-mail-body.tpl.php
diff -N rsvp-invitation-mail-body.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-invitation-mail-body.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,43 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-message.tpl.php
+ * Template for the plain text invitation email body
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+Dear @guest_name ,
+
+You have been invited by @sender_name at @site.
+
+You can view the full invitation, reply if you want to join or not, 
+and add a comment by following this link:
+@invitation_link
+  
+You can view the event by following this link:
+@event_link
+
+You also can visit the invitation by going to 'My account|Invitations'
+
+Please do not reply to this email.
+
+Regards,
+@sender_name
+
+***************************************************
+@message_body
\ No newline at end of file
Index: themes/default/rsvp-invitation-mail-subject.tpl.php
===================================================================
RCS file: rsvp-invitation-mail-subject.tpl.php
diff -N rsvp-invitation-mail-subject.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-invitation-mail-subject.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,24 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-subject.tpl.php
+ * Template for the invitation email subject
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+[@site] Invitation - @invitation_subject
\ No newline at end of file
Index: themes/default/rsvp-message-mail-body.tpl.php
===================================================================
RCS file: rsvp-message-mail-body.tpl.php
diff -N rsvp-message-mail-body.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-message-mail-body.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,43 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-message.tpl.php
+ * Template for the plain text invitation email body
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+Dear @guest_name,
+
+@sender_name at @site has sent you a message.
+
+You can view the full invitation, reply if you want to join or not,
+and add a comment by following this link:
+@invitation_link
+  
+You can view the event by following this link:
+@event_link
+
+You also can visit the invitation by going to 'My account|Invitations'
+
+Please do not reply to this email.
+
+Regards,
+@sender_name
+
+***************************************************
+@message_body
\ No newline at end of file
Index: themes/default/rsvp-message-mail-subject.tpl.php
===================================================================
RCS file: rsvp-message-mail-subject.tpl.php
diff -N rsvp-message-mail-subject.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-message-mail-subject.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,24 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-subject.tpl.php
+ * Template for the invitation email subject
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+[@site] Invitation - @invitation_subject
\ No newline at end of file
Index: themes/default/rsvp-notification-guest-mail-body.tpl.php
===================================================================
RCS file: rsvp-notification-guest-mail-body.tpl.php
diff -N rsvp-notification-guest-mail-body.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-notification-guest-mail-body.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,43 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-message.tpl.php
+ * Template for the plain text invitation email body
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+Dear @guest_name,
+
+This email is a confirmation that you have changed your response for this invitation.
+
+You can view the full invitation, reply if you want to join or not, 
+and add a comment by following this link:
+@invitation_link
+  
+You can view the event by following this link:
+@event_link
+
+You also can visit the invitation by going to 'My account|Invitations'
+
+Please do not reply to this email.
+
+Regards,
+The @site team
+
+***************************************************
+@message_body
\ No newline at end of file
Index: themes/default/rsvp-notification-guest-mail-subject.tpl.php
===================================================================
RCS file: rsvp-notification-guest-mail-subject.tpl.php
diff -N rsvp-notification-guest-mail-subject.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-notification-guest-mail-subject.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,24 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-subject.tpl.php
+ * Template for the invitation email subject
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+[@site] Invitation - @invitation_subject
\ No newline at end of file
Index: themes/default/rsvp-notification-moderator-mail-body.tpl.php
===================================================================
RCS file: rsvp-notification-moderator-mail-body.tpl.php
diff -N rsvp-notification-moderator-mail-body.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-notification-moderator-mail-body.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,43 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-message.tpl.php
+ * Template for the plain text invitation email body
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+Dear Moderator,
+
+This email is a confirmation that @guest_name at site @site has changed his response for this invitation.
+
+You can view the full invitation, reply if you want to join or not, 
+and add a comment by following this link:
+@invitation_link
+  
+You can view the event by following this link:
+@event_link
+
+You also can visit the invitation by going to 'My account|Invitations'
+
+Please do not reply to this email.
+
+Regards,
+The @site team
+
+***************************************************
+@message,_body
\ No newline at end of file
Index: themes/default/rsvp-notification-moderator-mail-subject.tpl.php
===================================================================
RCS file: rsvp-notification-moderator-mail-subject.tpl.php
diff -N rsvp-notification-moderator-mail-subject.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsvp-notification-moderator-mail-subject.tpl.php	21 Sep 2009 14:21:16 -0000
@@ -0,0 +1,24 @@
+<?php
+// $Id:
+
+/**
+ * @file rsvp-invitation-mail-subject.tpl.php
+ * Template for the invitation email subject
+ * All variables are sanitized to display directly
+ *
+ * Available replacement placeholders:
+ *
+ * $totalsarray: Array with type as key and an array as value (number, gif, text)
+ *
+ * @guest_name
+ * @sender_name
+ * @site
+ * @invitation_link
+ * @event_link
+ * @message_body
+ * @message_subject
+ * 
+ */
+?>
+
+[@site] Invitation - @invitation_subject
\ No newline at end of file