ICAL: add handling for appointment attendees.

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 428527eb49dd224a462dfc69d47697a642dd0302..ffacf41f471a3016e5dd818b45d14cdbd24614c0 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -20,6 +20,7 @@ CtxType CTX_ICAL = CTX_NONE;
 CtxType CTX_ICALPROPERTY = CTX_NONE;
 CtxType CTX_ICALMETHOD = CTX_NONE;
 CtxType CTX_ICALTIME = CTX_NONE;
+CtxType CTX_ICALATTENDEE = CTX_NONE;
 #if 0
 void SortPregetMatter(HashList *Cals)
 {
@@ -380,33 +381,62 @@ int cond_ICalIsMethod(StrBuf *Target, WCTemplputParams *TP)
 void tmplput_Conflict(StrBuf *Target, WCTemplputParams *TP)
 {}
 
-HashList* IterateGetAttendees()
+
+HashList *iterate_get_ical_attendees(StrBuf *Target, WCTemplputParams *TP)
 {
-/*
-       /* If the component has attendees, iterate through them. * /
+       icalcomponent *cal = (icalcomponent *) CTX(CTX_ICAL);
+       icalparameter *partstat_param;
+       icalproperty *p;
+       CalAttendee *Att;
+       HashList *Attendees = NULL;
+       const char *ch;
+       int n = 0;
+
+       /* If the component has attendees, iterate through them. */
        for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); 
             (p != NULL); 
             p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) {
-               StrBufAppendPrintf(Target, "<dt>");
-               StrBufAppendPrintf(Target, _("Attendee:"));
-               StrBufAppendPrintf(Target, "</dt><dd>");
                ch = icalproperty_get_attendee(p);
-               if ((ch != NULL) && !strncasecmp(buf, "MAILTO:", 7)) {
-
-                       /** screen name or email address * /
-                       safestrncpy(buf, ch + 7, sizeof(buf));
-                       striplt(buf);
-                       StrEscAppend(Target, NULL, buf, 0, 0);
-                       StrBufAppendPrintf(Target, " ");
-
-                       /** participant status * /
-                       partstat_as_string(buf, p);
-                       StrEscAppend(Target, NULL, buf, 0, 0);
+               if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
+                       Att = (CalAttendee*) malloc(sizeof(CalAttendee));
+
+                       /** screen name or email address */
+                       Att->AttendeeStr = NewStrBufPlain(ch + 7, -1);
+                       StrBufTrim(Att->AttendeeStr);
+
+                       /** participant status */
+                       partstat_param = icalproperty_get_first_parameter(
+                               p,
+                               ICAL_PARTSTAT_PARAMETER
+                               );
+                       if (partstat_param == NULL) {
+                               Att->partstat = ICAL_PARTSTAT_X;
+                       }
+                       else {
+                               Att->partstat = icalparameter_get_partstat(partstat_param);
+                       }
+                       if (Attendees == NULL)
+                               Attendees = NewHash(1, Flathash);
+                       Put(Attendees, IKEY(n), Att, DeleteAtt);
+                       n++;
                }
-               StrBufAppendPrintf(Target, "</dd>\n");
        }
-*/
-       return NULL;
+       return Attendees;
+}
+
+void tmplput_ICalAttendee(StrBuf *Target, WCTemplputParams *TP)
+{
+       CalAttendee *Att = (CalAttendee*) CTX(CTX_ICALATTENDEE);
+       StrBufAppendTemplate(Target, TP, Att->AttendeeStr, 0);
+}
+int cond_ICalAttendeeState(StrBuf *Target, WCTemplputParams *TP)
+{
+       CalAttendee *Att = (CalAttendee*) CTX(CTX_ICALATTENDEE);
+       icalparameter_partstat which_partstat;
+
+       which_partstat = GetTemplateTokenNumber(Target, TP, 2, ICAL_PARTSTAT_X);
+       return Att->partstat == which_partstat;
+}
        /* If the component has subcomponents, recurse through them. * /
        for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
             (c != 0);
@@ -415,7 +445,6 @@ HashList* IterateGetAttendees()
                cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum);
        }
        */
-}
 
 
 void 
@@ -434,6 +463,12 @@ InitModule_ICAL_SUBST
 
        RegisterNamespace("ICAL:SERV:CHECK:CONFLICT", 0, 0, tmplput_Conflict, NULL, CTX_ICAL);
 
+       RegisterCTX(CTX_ICALATTENDEE);
+        RegisterIterator("ICAL:ATTENDEES", 0, NULL, iterate_get_ical_attendees, 
+                         NULL, NULL, CTX_ICALATTENDEE, CTX_ICAL, IT_NOFLAG);
+       RegisterNamespace("ICAL:ATTENDEE", 1, 2, tmplput_ICalAttendee, NULL, CTX_ICALATTENDEE);
+       RegisterConditional("COND:ICAL:ATTENDEE", 1, cond_ICalAttendeeState, CTX_ICALATTENDEE);
+
        RegisterCTX(CTX_ICALPROPERTY);
        RegisterNamespace("ICAL:ITEM", 1, 2, tmplput_ICalItem, NULL, CTX_ICAL);
        RegisterNamespace("ICAL:PROPERTY:STR", 0, 1, tmplput_CtxICalProperty, NULL, CTX_ICALPROPERTY);

diff --git a/webcit/static/t/ical/attachment/display.html b/webcit/static/t/ical/attachment/display.html
index c2654612bc0121d6a0bfda8e113dd044e9d9b6e9..24f506759ad9c78a3e4d4ad659692cd5127d0f6c 100644 (file)
--- a/webcit/static/t/ical/attachment/display.html
+++ b/webcit/static/t/ical/attachment/display.html
@@ -5,7 +5,6 @@
 <img src="static/webcit_icons/essen/32x32/calendar.png">
 <span>
 &nbsp;&nbsp;
-
 <??("COND:ICAL:METHOD", 1, #"ICAL_METHOD_REQUEST")><??("COND:ICAL:METHOD", 2, #"ICAL_METHOD_REPLY")><??("COND:ICAL:METHOD", 3, #"ICAL_METHOD_PUBLISH")>
 <?_("This is an unknown type of calendar item.")>
 <??("X", 1)><??("X", 2)><??("X", 3)>
@@ -20,53 +19,36 @@
 <?!("X", 13)>
 </span>
 </div>
-<dl>
-<?!("COND:ICAL:PROPERTY", 44, #"ICAL_SUMMARY_PROPERTY")>
-<dt><?_("Summary:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd>
-<?!("X", 44)>
-<?!("COND:ICAL:PROPERTY", 55, #"ICAL_LOCATION_PROPERTY")>
-<dt><?_("Location:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd>
-<?!("X", 55)>
 
 
+<?--("------------------------------")>
+<dl>
+<?!("COND:ICAL:PROPERTY", 44, #"ICAL_SUMMARY_PROPERTY")><dt><?_("Summary:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd><?!("X", 44)>
+<?!("COND:ICAL:PROPERTY", 55, #"ICAL_LOCATION_PROPERTY")><dt><?_("Location:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd><?!("X", 55)>
 
+<?--("------------------------------")>
 <?!("COND:ICAL:IS:A", 66, #"ICAL_VEVENT_COMPONENT")>
-
 <?!("COND:ICAL:DT:PROPERTY", 67, #"ICAL_DTSTART_PROPERTY")>
-<?!("COND:ICAL:DT:ISDATE", 68)>
-<dt><?_("Date:")></dt><dd><?ICAL:DT:DATE()></dd>
-<?!("X", 68)>
-<??("COND:ICAL:DT:ISDATE", 69)>
-<dt><?_("Starting date/time:")></dt><dd><?ICAL:DT:DATETIME()></dd>
-<??("X", 69)>
+<?!("COND:ICAL:DT:ISDATE", 68)><dt><?_("Date:")></dt><dd><?ICAL:DT:DATE()></dd><?!("X", 68)>
+<??("COND:ICAL:DT:ISDATE", 69)><dt><?_("Starting date/time:")></dt><dd><?ICAL:DT:DATETIME()></dd><??("X", 69)>
 <?!("X", 67)>
-
-<?!("COND:ICAL:DT:PROPERTY", 77, #"ICAL_DTEND_PROPERTY")>
-<dt><?_("Ending date/time:")></dt><dd><?ICAL:DT:DATETIME()></dd>
-<?!("X", 77)>
-
+<?!("COND:ICAL:DT:PROPERTY", 77, #"ICAL_DTEND_PROPERTY")><dt><?_("Ending date/time:")></dt><dd><?ICAL:DT:DATETIME()></dd><?!("X", 77)>
 <?!("X", 66)>
 
 
-<?!("COND:ICAL:PROPERTY", 88, #"ICAL_DESCRIPTION_PROPERTY")>
-<dt><?_("Description:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd>
-<?!("X", 88)>
+<?!("COND:ICAL:PROPERTY", 88, #"ICAL_DESCRIPTION_PROPERTY")><dt><?_("Description:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd><?!("X", 88)>
 
-<?!("COND:ICAL:PROPERTY", 99, #"ICAL_DESCRIPTION_PROPERTY")>
 <?--("Unusual string syntax used here in order to re-use existing translations")>
-<dt><?_("Recurrence")></dt><dd><?_("This is a recurring event")>.</dd>
-<?!("X", 99)>
+<?!("COND:ICAL:PROPERTY", 99, #"ICAL_DESCRIPTION_PROPERTY")><dt><?_("Recurrence")></dt><dd><?_("This is a recurring event")>.</dd><?!("X", 99)>
 
 
+<?ITERATE("ICAL:ATTENDEES", ="ical_attachment_display_attendees")>
 
+</dl>
 
-<?!("COND:ICAL:METHOD", 110, #"ICAL_METHOD_REQUEST")>
 <?--("If this is a REQUEST, display conflicts and buttons")>
-<?--("Check for conflicts")>
+<?!("COND:ICAL:METHOD", 110, #"ICAL_METHOD_REQUEST")>
 <?ICAL:SERV:CHECK:CONFLICT()>
-
-</dl>
-
 <?--("Display the Accept/Decline buttons")>
 <p id="rsvp<?BSTR("divname")>_question">
 <?_("How would you like to respond to this invitation?")>
@@ -77,11 +59,10 @@
 </span>&nbsp;&nbsp;&nbsp;<span class="button_link">
 <a href="javascript:RespondToInvitation('rsvp<?BSTR("divname")>_question','rsvp<?BSTR("divname")>_title','<?BSTR("msgnum")>','<?BSTR("cal_partnum")>','Decline');"><?_("Decline")></a>
 </span></p>
-<??("X", 100)>
+<??("X", 110)>
 
 <?--("If this is a REPLY, display update button")>
-<?!("COND:ICAL:METHOD", 110, #"ICAL_METHOD_REPLY")>
-<?--("Display the update buttons")>
+<?!("COND:ICAL:METHOD", 120, #"ICAL_METHOD_REPLY")>
 <p id="rsvp<?BSTR("divname")>_question" >
 <?_("Click <i>Update</i> to accept this reply and update your calendar.")>
 &nbsp;&nbsp;&nbsp;<span class="button_link">
@@ -89,9 +70,9 @@
 </span>&nbsp;&nbsp;&nbsp;<span class="button_link">
 <a href="javascript:HandleRSVP('rsvp<?BSTR("divname")>_question','rsvp<?BSTR("divname")>_title','<?BSTR("msgnum")>','<?BSTR("cal_partnum")>','Ignore');"><?_("Ignore")></a>
 </span></p>
-<?!("X", 110)>
+<?!("X", 120)>
 
 <?--("Trailing HTML for the display of this object")>
-       if (recursion_level == 0) {
+<?--("if (recursion_level == 0) {")>
 <p>&nbsp;</p></div>
-       }
+<?--("}")>

diff --git a/webcit/static/t/ical/attachment/display_attendees.html b/webcit/static/t/ical/attachment/display_attendees.html
new file mode 100644 (file)
index 0000000..027292d
--- /dev/null
+++ b/webcit/static/t/ical/attachment/display_attendees.html
@@ -0,0 +1,14 @@
+<dt>
+<?_("Attendee:")>
+</dt><dd>
+<?ICAL:ATTENDEE("X")>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_X")>(x)<??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_NEEDSACTION")><?_("(needs action)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_ACCEPTED")><?_("(accepted)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_DECLINED")><?_("(declined)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_TENTATIVE")><?_("(tenative)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_DELEGATED")><?_("(delegated)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_COMPLETED")><?_("(completed)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_INPROCESS")><?_("(in process)")><??("X", 1)>
+<?!("COND:ICAL:ATTENDEE", 1, #"ICAL_PARTSTAT_NONE")><?_("(none)")><??("X", 1)>
+</dd>