[CalendarServer-changes] [4343] CalendarServer/branches/users/wsanchez/deployment/twistedcaldav

[source_changes at macosforge.org]

Revision: 4343
          http://trac.macosforge.org/projects/calendarserver/changeset/4343
Author:   cdaboo at apple.com
Date:     2009-06-15 20:16:09 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
Make VFREEBUSY logging a separate option. Also make sure that auto-replies from rooms/resources are put in
the Organizer's accounting directory.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/itip.py
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/schedule.py

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/itip.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/itip.py	2009-06-16 01:14:54 UTC (rev 4342)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/itip.py	2009-06-16 03:16:09 UTC (rev 4343)
@@ -555,7 +555,9 @@
     # Get the Inbox of the ORGANIZER
     organizer = replycal.getOrganizer()
     assert organizer is not None
-    inboxURL = ainbox.principalForCalendarUserAddress(organizer).scheduleInboxURL()
+    organizerPrincipal = ainbox.principalForCalendarUserAddress(organizer)
+    assert organizerPrincipal is not None
+    inboxURL = organizerPrincipal.scheduleInboxURL()
     assert inboxURL
     
     # Determine whether current principal has CALDAV:schedule right on that Inbox
@@ -570,9 +572,9 @@
     # Now deposit the new calendar into the inbox
     result = yield writeResource(request, inboxURL, inbox, None, replycal)
 
-    if accountingEnabled("iTIP", principal):
+    if accountingEnabled("iTIP", organizerPrincipal):
         emitAccounting(
-            "iTIP", principal,
+            "iTIP", organizerPrincipal,
             "Originator: %s\nRecipients: %s\n\n%s"
             % (principal.principalURL(), str(organizer), str(replycal))
         )

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/schedule.py	2009-06-16 01:14:54 UTC (rev 4342)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/schedule.py	2009-06-16 03:16:09 UTC (rev 4343)
@@ -414,12 +414,20 @@
         # shows up in a given principal's calendars, rather than
         # tracking the activities of a specific user.
         #
-        if accountingEnabled("iTIP", organizerPrincipal):
-            emitAccounting(
-                "iTIP", organizerPrincipal,
-                "Originator: %s\nRecipients: %s\n\n%s"
-                % (originator, ", ".join(recipients), str(calendar))
-            )
+        if freebusy:
+            if accountingEnabled("iTIP-VFREEBUSY", organizerPrincipal):
+                emitAccounting(
+                    "iTIP-VFREEBUSY", organizerPrincipal,
+                    "Originator: %s\nRecipients: %s\n\n%s"
+                    % (originator, ", ".join(recipients), str(calendar))
+                )
+        else:
+            if accountingEnabled("iTIP", organizerPrincipal):
+                emitAccounting(
+                    "iTIP", organizerPrincipal,
+                    "Originator: %s\nRecipients: %s\n\n%s"
+                    % (originator, ", ".join(recipients), str(calendar))
+                )
 
         # Prepare for multiple responses
         responses = ScheduleResponseQueue("POST", responsecode.OK)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090615/917532fe/attachment.html>