# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1444754066 -7200
# Node ID 2e4284aee9682bc7ab57719151eda5f24e96a6b0
# Parent  5942d3fcfb5d5dd7f08968d9656101cb1c3e4d1d
Removed postponed identity setting for outgoing messages, using Bcc outgoing
details or sender details instead.
Changed the object validity testing for the ADD method in the outgoing handler.
Updated test templates to mention outgoing addresses.

diff -r 5942d3fcfb5d -r 2e4284aee968 imiptools/__init__.py
--- a/imiptools/__init__.py	Tue Oct 13 17:10:40 2015 +0200
+++ b/imiptools/__init__.py	Tue Oct 13 18:34:26 2015 +0200
@@ -95,9 +95,22 @@
         # However, outgoing messages do not usually presume anything about the
         # eventual recipients and focus on the sender instead.
 
+        # The sender's address is preferably derived from any outgoing recipient
+        # address because the "From" header may provide a different address
+        # (from the calendar system) to the actual address of the user.
+
         else:
-            Recipient(None, messenger, store, publisher, preferences_dir, self.handlers, self.outgoing_only, self.debug
-                     ).process(msg, senders)
+            prefix = "%s+" % config.OUTGOING_PREFIX
+            copied = [recipient[len(prefix):]
+                      for recipient in get_addresses(get_all_values(msg, "Bcc"))
+                                    or []
+                      if recipient.startswith(prefix)] or \
+                     get_addresses(get_all_values(msg, "From")) or \
+                     []
+
+            if copied and len(copied) == 1:
+                Recipient(get_uri(copied[0]), messenger, store, publisher, preferences_dir, self.handlers, self.outgoing_only, self.debug
+                         ).process(msg, senders)
 
     def process_args(self, args, stream):
 
@@ -236,7 +249,7 @@
         # Check for participating recipients. Non-participating recipients will
         # have their messages left as being unhandled.
 
-        if self.outgoing_only or self.is_participating():
+        if self.is_participating():
 
             # Check for returned messages.
 
diff -r 5942d3fcfb5d -r 2e4284aee968 imiptools/content.py
--- a/imiptools/content.py	Tue Oct 13 17:10:40 2015 +0200
+++ b/imiptools/content.py	Tue Oct 13 18:34:26 2015 +0200
@@ -69,7 +69,6 @@
                 # Dispatch to a handler and obtain any response.
 
                 handler.set_object(Object({name : item}))
-                handler.set_identity(method)
 
                 if handler.is_usable(method):
 
diff -r 5942d3fcfb5d -r 2e4284aee968 imiptools/handlers/person_outgoing.py
--- a/imiptools/handlers/person_outgoing.py	Tue Oct 13 17:10:40 2015 +0200
+++ b/imiptools/handlers/person_outgoing.py	Tue Oct 13 18:34:26 2015 +0200
@@ -20,8 +20,7 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from imiptools.client import Client
-from imiptools.data import get_uri, uri_dict, uri_values
+from imiptools.data import uri_dict, uri_values
 from imiptools.handlers import Handler
 from imiptools.handlers.common import CommonEvent
 
@@ -29,34 +28,15 @@
 
     "Handling mechanisms specific to people."
 
-    def set_identity(self, method):
-
-        """
-        Set the current user for the current object in the context of the given
-        'method'. It is usually set when initialising the handler, using the
-        recipient details, but outgoing messages do not reference the recipient
-        in this way.
-        """
-
-        if self.obj:
-            from_organiser = method in self.organiser_methods
-            self.user = get_uri(self.obj.get_value(from_organiser and "ORGANIZER" or "ATTENDEE"))
-
     def _add(self):
 
         "Add a recurrence for the current object."
 
-        if not Client.is_participating(self):
-            return False
-
-        # Obtain valid organiser and attendee details.
+        # Check for event using UID.
 
-        oa = self.require_organiser_and_attendees()
-        if not oa:
+        if not self.have_new_object():
             return False
 
-        (organiser, organiser_attr), attendees = oa
-
         # Ignore unknown objects.
 
         if not self.get_stored_object_version():
@@ -83,9 +63,6 @@
         from an organiser if 'from_organiser' is set to a true value.
         """
 
-        if not Client.is_participating(self):
-            return False
-
         # Check for a new event, tolerating not-strictly-new events if the
         # attendee is responding.
 
@@ -141,9 +118,6 @@
         from an organiser if 'from_organiser' is set to a true value.
         """
 
-        if not Client.is_participating(self):
-            return False
-
         # Check for event using UID.
 
         if not self.have_new_object():
@@ -210,9 +184,6 @@
 
         "Remove any counter-proposals for the given event."
 
-        if not Client.is_participating(self):
-            return False
-
         # Check for event using UID.
 
         if not self.have_new_object():
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-add-person-recurring.txt
--- a/tests/templates/event-add-person-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-add-person-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-add-recurring.txt
--- a/tests/templates/event-add-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-add-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-multiple-attendee.txt
--- a/tests/templates/event-cancel-multiple-attendee.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-multiple-attendee.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Uninvite only resource-room-confroom from the event.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-person-all.txt
--- a/tests/templates/event-cancel-person-all.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-person-all.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for vincent.vole and paul.boddie. The free/busy details for
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-person-recurring-instance.txt
--- a/tests/templates/event-cancel-person-recurring-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-person-recurring-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel an instance for vincent.vole and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-person-recurring-rescheduled-instance.txt
--- a/tests/templates/event-cancel-person-recurring-rescheduled-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-person-recurring-rescheduled-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel an instance for vincent.vole and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-person-recurring.txt
--- a/tests/templates/event-cancel-person-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-person-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for vincent.vole and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-person.txt
--- a/tests/templates/event-cancel-person.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-person.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for vincent.vole and paul.boddie. The free/busy details for
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring-day.txt
--- a/tests/templates/event-cancel-recurring-day.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring-day.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring-exdate-floating.txt
--- a/tests/templates/event-cancel-recurring-exdate-floating.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring-exdate-floating.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring-exdate.txt
--- a/tests/templates/event-cancel-recurring-exdate.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring-exdate.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring-indefinitely.txt
--- a/tests/templates/event-cancel-recurring-indefinitely.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring-indefinitely.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring-instance.txt
--- a/tests/templates/event-cancel-recurring-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel an instance for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel-recurring.txt
--- a/tests/templates/event-cancel-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-cancel.txt
--- a/tests/templates/event-cancel.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-cancel.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Cancellation!
 
 Cancel the event for resource-room-confroom and paul.boddie.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-refresh-person-recurring-non-attendee.txt
--- a/tests/templates/event-refresh-person-recurring-non-attendee.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-refresh-person-recurring-non-attendee.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: oliver.otter@example.com
 To: paul.boddie@example.com
+Bcc: people-outgoing+oliver.otter@example.com
 Subject: Refresh!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-refresh-person-recurring.txt
--- a/tests/templates/event-refresh-person-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-refresh-person-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: vincent.vole@example.com
 To: paul.boddie@example.com
+Bcc: people-outgoing+vincent.vole@example.com
 Subject: Refresh!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-bad-dtend.txt
--- a/tests/templates/event-request-bad-dtend.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-bad-dtend.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-bad-dtstamp.txt
--- a/tests/templates/event-request-bad-dtstamp.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-bad-dtstamp.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-bad-dtstart.txt
--- a/tests/templates/event-request-bad-dtstart.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-bad-dtstart.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-conflict-utc.txt
--- a/tests/templates/event-request-conflict-utc.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-conflict-utc.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-conflict.txt
--- a/tests/templates/event-request-conflict.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-conflict.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-group.txt
--- a/tests/templates/event-request-group.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-group.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: $SENDERADDRESS
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+$SENDERADDRESS@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-imposter-attendee.txt
--- a/tests/templates/event-request-imposter-attendee.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-imposter-attendee.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: harvey.horse@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+harvey.horse@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-imposter.txt
--- a/tests/templates/event-request-imposter.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-imposter.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: vincent.vole@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+vincent.vole@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-multiple.txt
--- a/tests/templates/event-request-multiple.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-multiple.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com, resource-car-porsche911@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person-conflict.txt
--- a/tests/templates/event-request-person-conflict.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person-conflict.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person-recurring-day-floating.txt
--- a/tests/templates/event-request-person-recurring-day-floating.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person-recurring-day-floating.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person-recurring-reschedule-instance.txt
--- a/tests/templates/event-request-person-recurring-reschedule-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person-recurring-reschedule-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person-recurring.txt
--- a/tests/templates/event-request-person-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person-spoofed.txt
--- a/tests/templates/event-request-person-spoofed.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person-spoofed.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: harvey.horse@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+harvey.horse@example.com
 Subject: Spoofed request
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-person.txt
--- a/tests/templates/event-request-person.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-person.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: vincent.vole@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 Test invitation of people, checking their status afterwards.
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-day-reschedule-instance.txt
--- a/tests/templates/event-request-recurring-day-reschedule-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-day-reschedule-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Rescheduling!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-day.txt
--- a/tests/templates/event-request-recurring-day.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-day.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-exdate-floating.txt
--- a/tests/templates/event-request-recurring-exdate-floating.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-exdate-floating.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-exdate.txt
--- a/tests/templates/event-request-recurring-exdate.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-exdate.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-indefinitely.txt
--- a/tests/templates/event-request-recurring-indefinitely.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-indefinitely.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring-reschedule-instance.txt
--- a/tests/templates/event-request-recurring-reschedule-instance.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring-reschedule-instance.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Rescheduling!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-recurring.txt
--- a/tests/templates/event-request-recurring.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-recurring.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-sauna-bad.txt
--- a/tests/templates/event-request-sauna-bad.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-sauna-bad.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-sauna@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-sauna-good.txt
--- a/tests/templates/event-request-sauna-good.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-sauna-good.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-sauna@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-sauna-rival.txt
--- a/tests/templates/event-request-sauna-rival.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-sauna-rival.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: vincent.vole@example.com
 To: resource-room-sauna@example.com
+Bcc: people-outgoing+vincent.vole@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request-spoofed.txt
--- a/tests/templates/event-request-spoofed.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request-spoofed.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: vincent.vole@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+vincent.vole@example.com
 Subject: Spoofed request
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/templates/event-request.txt
--- a/tests/templates/event-request.txt	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/templates/event-request.txt	Tue Oct 13 18:34:26 2015 +0200
@@ -2,6 +2,7 @@
 MIME-Version: 1.0
 From: paul.boddie@example.com
 To: resource-room-confroom@example.com
+Bcc: people-outgoing+paul.boddie@example.com
 Subject: Invitation!
 
 --===============0047278175==
diff -r 5942d3fcfb5d -r 2e4284aee968 tests/test_person_invitation_counter.sh
--- a/tests/test_person_invitation_counter.sh	Tue Oct 13 17:10:40 2015 +0200
+++ b/tests/test_person_invitation_counter.sh	Tue Oct 13 18:34:26 2015 +0200
@@ -164,6 +164,7 @@
   sed 's/COUNTER/DECLINECOUNTER/' < out2.tmp \
 | sed 's/^From: calendar/To: vincent.vole/' \
 | sed 's/^To: paul.boddie/From: paul.boddie/' \
+| sed 's/^Bcc: people-outgoing+vincent.vole/Bcc: people-outgoing+paul.boddie/' \
 > out5.tmp
 
 "$OUTGOING_SCRIPT" $ARGS < out5.tmp 2>> $ERROR