[CalendarServer-changes] [3061] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3061
          http://trac.macosforge.org/projects/calendarserver/changeset/3061
Author:   sagen at apple.com
Date:     2008-09-25 12:04:47 -0700 (Thu, 25 Sep 2008)
Log Message:
-----------
Fixes bugs:
- "Non mailto: organizers fail to send email invites"
- "test failure: twistedcaldav.directory.test.test_opendirectory.OpenDirectory.test_invalidODDigest"
- Organizer's ATTENDEE property also needs to be switched to the special server email address with token

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
    CalendarServer/trunk/twistedcaldav/mail.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2008-09-25 16:26:41 UTC (rev 3060)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2008-09-25 19:04:47 UTC (rev 3061)
@@ -69,7 +69,7 @@
                 fullName              = "Some user",
                 firstName             = "Some",
                 lastName              = "User",
-                emailAddress          = "someuser at example.com",
+                emailAddresses        = set(("someuser at example.com",)),
                 calendarUserAddresses = set(("mailtoguid at example.com",)),
                 autoSchedule          = False,
                 enabledForCalendaring = True,

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2008-09-25 16:26:41 UTC (rev 3060)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2008-09-25 19:04:47 UTC (rev 3061)
@@ -656,19 +656,22 @@
         addressWithToken = "%s+%s@%s" % (pre, token, post)
         calendar.getOrganizerProperty().setValue("mailto:%s" %
             (addressWithToken,))
+        calendar.getAttendeeProperty([organizer]).setValue("mailto:%s" %
+            (addressWithToken,))
 
         msgId, message = self._generateTemplateMessage(calendar, organizer)
 
         # The email's From: will be the calendar server's address (without
         # + addressing), while the Reply-To: will be the organizer's email
-        # address.
-        if not organizer.startswith("mailto:"):
-            raise ValueError("ORGANIZER address '%s' must be mailto: for iMIP operation." % (organizer,))
-        organizer = organizer[7:]
+        # address (but only if it *is* an email address).
+        if organizer.startswith("mailto:"):
+            message = message.replace("${replytoaddress}", organizer[7:])
+        else:
+            message = message.replace("${replytoaddress}", addressWithToken)
+
         fromAddr = serverAddress
         toAddr = attendee
         message = message.replace("${fromaddress}", fromAddr)
-        message = message.replace("${replytoaddress}", organizer)
 
         if not attendee.startswith("mailto:"):
             raise ValueError("ATTENDEE address '%s' must be mailto: for iMIP operation." % (attendee,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080925/cd16fc07/attachment.html