1.1 --- a/imipweb/handler.py Wed May 20 15:06:33 2015 +0200
1.2 +++ b/imipweb/handler.py Wed May 20 15:55:03 2015 +0200
1.3 @@ -80,12 +80,8 @@
1.4 # newer details (since the outgoing handler updates this user's
1.5 # free/busy details).
1.6
1.7 - update_freebusy(freebusy,
1.8 - self.obj.get_periods(self.get_tzid(), self.get_window_end()),
1.9 - self.obj.get_value("TRANSP") or "OPAQUE",
1.10 - self.uid, self.recurrenceid,
1.11 - self.obj.get_value("SUMMARY"),
1.12 - organiser)
1.13 + self.update_freebusy(freebusy,
1.14 + self.obj.get_periods(self.get_tzid(), self.get_window_end()))
1.15
1.16 user_attr = self.messenger and self.messenger.sender != get_address(self.user) and \
1.17 {"SENT-BY" : get_uri(self.messenger.sender)} or {}
1.18 @@ -111,21 +107,14 @@
1.19
1.20 # Reply only on behalf of this user.
1.21
1.22 - for attendee, attendee_attr in uri_items(self.obj.get_items("ATTENDEE")):
1.23 + attendee_attr = self.update_participation(self.obj)
1.24
1.25 - if attendee == self.user:
1.26 - if attendee_attr.has_key("RSVP"):
1.27 - del attendee_attr["RSVP"]
1.28 - if self.messenger and self.messenger.sender != get_address(attendee):
1.29 - attendee_attr["SENT-BY"] = get_uri(self.messenger.sender)
1.30 - self.obj["ATTENDEE"] = [(attendee, attendee_attr)]
1.31 -
1.32 - self.update_dtstamp()
1.33 - self.set_sequence(False)
1.34 -
1.35 - self.send_message("REPLY", get_address(attendee), from_organiser=False)
1.36 -
1.37 - return True
1.38 + if attendee_attr:
1.39 + self.obj["ATTENDEE"] = [(self.user, attendee_attr)]
1.40 + self.update_dtstamp()
1.41 + self.set_sequence(False)
1.42 + self.send_message("REPLY", get_address(self.user), from_organiser=False)
1.43 + return True
1.44
1.45 return False
1.46