[CalendarServer-changes] [3068] CalendarServer/trunk/twistedcaldav/directory
source_changes at macosforge.org
source_changes at macosforge.org
Fri Sep 26 11:07:14 PDT 2008
Revision: 3068
http://trac.macosforge.org/projects/calendarserver/changeset/3068
Author: sagen at apple.com
Date: 2008-09-26 11:07:14 -0700 (Fri, 26 Sep 2008)
Log Message:
-----------
Make sure mailto: CUAs are case-insensitively compared
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
CalendarServer/trunk/twistedcaldav/directory/directory.py
CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-09-26 16:20:10 UTC (rev 3067)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2008-09-26 18:07:14 UTC (rev 3068)
@@ -351,7 +351,7 @@
if isinstance(emails, str):
emails = [emails]
for email in emails:
- result.add("mailto:%s" % (email,))
+ result.add("mailto:%s" % (email.lower(),))
return result
@@ -534,10 +534,10 @@
emailAddresses = set()
addrs = val.get(dsattributes.kDSNAttrEMailAddress, None)
if isinstance(addrs, str):
- emailAddresses.add(addrs)
+ emailAddresses.add(addrs.lower())
elif isinstance(addrs, list):
for addr in addrs:
- emailAddresses.add(addr)
+ emailAddresses.add(addr.lower())
# TODO: Review this code...
calendarUserAddresses = set()
@@ -663,10 +663,10 @@
# Get email address from directory record
emailAddresses = set()
if isinstance(recordEmailAddress, str):
- emailAddresses.add(recordEmailAddress)
+ emailAddresses.add(recordEmailAddress.lower())
elif isinstance(recordEmailAddress, list):
for addr in emailAddresses:
- emailAddresses.add(addr)
+ emailAddresses.add(addr.lower())
# Special case for groups, which have members.
if recordType == DirectoryService.recordType_groups:
Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py 2008-09-26 16:20:10 UTC (rev 3067)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py 2008-09-26 18:07:14 UTC (rev 3068)
@@ -128,6 +128,7 @@
return None
def recordWithCalendarUserAddress(self, address):
+ address = address.lower()
for record in self.allRecords():
if address in record.calendarUserAddresses:
return record
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2008-09-26 16:20:10 UTC (rev 3067)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2008-09-26 18:07:14 UTC (rev 3068)
@@ -268,7 +268,7 @@
self.lastName = child.firstChild.data.encode("utf-8")
elif child_name == ELEMENT_EMAIL_ADDRESS:
if child.firstChild is not None:
- self.emailAddresses.add(child.firstChild.data.encode("utf-8"))
+ self.emailAddresses.add(child.firstChild.data.encode("utf-8").lower())
elif child_name == ELEMENT_MEMBERS:
self._parseMembers(child, self.members)
elif child_name == ELEMENT_CUADDR:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080926/c5c8189a/attachment.html
More information about the calendarserver-changes
mailing list