[CalendarServer-changes] [1748] CalendarServer/trunk/twistedcaldav/directory/principal.py

[source_changes at macosforge.org]

Revision: 1748
          http://trac.macosforge.org/projects/calendarserver/changeset/1748
Author:   wsanchez at apple.com
Date:     2007-08-01 13:35:33 -0700 (Wed, 01 Aug 2007)

Log Message:
-----------
Add alternate principal URIs to the list of valid calendar user addresses for each principal.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-08-01 18:03:32 UTC (rev 1747)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-08-01 20:35:33 UTC (rev 1748)
@@ -520,14 +520,18 @@
         return self.record.guid
         
     def calendarUserAddresses(self):
-        # Add the principal URL and GUID to whatever calendar user addresses
-        # the directory record provides.
+        # Get any CUAs defined by the directory implementation.
         addresses = set(self.record.calendarUserAddresses)
-        addresses.add(self.principalURL())
-        if config.HTTPPort:
-            addresses.add("http://%s:%s%s" % (config.ServerHostName, config.HTTPPort, self.principalURL(),))
-        if config.SSLPort:
-            addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, self.principalURL(),))
+
+        # Add the principal URL and alternate URIs to the list.
+        for uri in ((self.principalURL(),) + tuple(self.alternateURIs())):
+            addresses.add(uri)
+            if config.HTTPPort:
+                addresses.add("http://%s:%s%s" % (config.ServerHostName, config.HTTPPort, uri))
+            if config.SSLPort:
+                addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, uri))
+
+        # Add a UUID URI based on the record's GUID to the list.
         addresses.add("urn:uuid:%s" % (self.record.guid,))
 
         return addresses

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070801/c8b8829e/attachment.html