]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
* Display PARTSTAT for attendees
[citadel.git] / webcit / event.c
index 990a06b2f2884bee6ecab604cced6966166846bb..45d1e2932f1b0751e017998a01633e4c727cd185 100644 (file)
@@ -46,8 +46,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        char buf[SIZ];
        int i;
        int organizer_is_me = 0;
+       int sequence = 0;
 
-       now = time(NULL);
+       now = time(NULL) % 60;  /* mod 60 to force :00 seconds */
        strcpy(organizer_string, "");
        strcpy(attendee_string, "");
 
@@ -59,6 +60,13 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                created_new_vevent = 1;
        }
 
+       /* Learn the sequence */
+       p = icalcomponent_get_first_property(vevent, ICAL_SEQUENCE_PROPERTY);
+       if (p != NULL) {
+               sequence = icalproperty_get_sequence(p);
+       }
+
+       /* Begin output */
        output_headers(3);
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
                "<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
@@ -74,6 +82,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
+       wprintf("<BR>\n");
+       wprintf("SEQUENCE == %d<BR>\n", sequence);
        *************************************************************/
 
        wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" ACTION=\"/save_event\">\n");
@@ -128,12 +138,13 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                if (strlen(bstr("hour")) > 0) {
                        t_start.hour = atoi(bstr("hour"));
                        t_start.minute = atoi(bstr("minute"));
+                       t_start.second = 0;
                }
                else {
                        t_start.hour = 9;
                        t_start.minute = 0;
+                       t_start.second = 0;
                }
-               /* t_start = icaltime_from_timet(now, 0); */
        }
        display_icaltimetype_as_webform(&t_start, "dtstart");
 
@@ -191,6 +202,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                         */
                        t_end = t_start;
                        t_end.hour += 1;
+                       t_end.second = 0;
                        t_end = icaltime_normalize(t_end);
                        /* t_end = icaltime_from_timet(now, 0); */
                }
@@ -219,8 +231,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                );
        }
 
-       /* Determine who is the organizer of this event.  This is useless
-        * for now, but we'll need to determine "me" or "not me" soon.
+       /* Determine who is the organizer of this event.
+        * We need to determine "me" or "not me."
         */
        organizer = icalcomponent_get_first_property(vevent,
                                                ICAL_ORGANIZER_PROPERTY);
@@ -229,8 +241,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
                        strcpy(organizer_string, &organizer_string[7]);
                        striplt(organizer_string);
+                       lprintf(9, "ISME %s\n", organizer_string);
                        serv_printf("ISME %s", organizer_string);
                        serv_gets(buf);
+                       lprintf(9, "%s\n", buf);
                        if (buf[0] == '2') {
                                organizer_is_me = 1;
                        }
@@ -242,6 +256,17 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                wprintf(" <FONT SIZE=-1><I>"
                        "(you are the organizer)</I></FONT>\n");
        }
+
+       /*
+        * Transmit the organizer as a hidden field.   We don't want the user
+        * to be able to change it, but we do want it fed back to the server,
+        * especially if this is a new event and there is no organizer already
+        * in the calendar object.
+        */
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"organizer\" VALUE=\"");
+       escputs(organizer_string);
+       wprintf("\">");
+
        wprintf("</TD></TR>\n");
 
        /* Attendees (do more with this later) */
@@ -256,10 +281,17 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
                strcpy(attendee_string, icalproperty_get_attendee(attendee));
                if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+
+                       /* screen name or email address */
                        strcpy(attendee_string, &attendee_string[7]);
                        striplt(attendee_string);
                        if (i++) wprintf(", ");
                        escputs(attendee_string);
+                       wprintf(" ");
+
+                       /* participant status */
+                       partstat_as_string(buf, attendee);
+                       escputs(buf);
                }
        }
        wprintf("</TEXTAREA></TD></TR>\n");
@@ -317,12 +349,18 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
  */
 void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        char buf[SIZ];
-       int delete_existing = 0;
        icalproperty *prop;
        icalcomponent *vevent;
        int created_new_vevent = 0;
        int all_day_event = 0;
        struct icaltimetype event_start;
+       icalproperty *attendee = NULL;
+       char attendee_string[SIZ];
+       int i;
+       int foundit;
+       char form_attendees[SIZ];
+       char organizer_string[SIZ];
+       int sequence = 0;
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
@@ -343,7 +381,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                }
                icalcomponent_add_property(vevent,
                        icalproperty_new_summary(bstr("summary")));
-               
+
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_LOCATION_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
@@ -368,7 +406,6 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 
                if (!strcmp(bstr("alldayevent"), "yes")) {
                        all_day_event = 1;
-                       lprintf(9, "*** all day event ***\n");
                }
                else {
                        all_day_event = 0;
@@ -430,7 +467,93 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        );
                }
 
-               /* Serialize it and save it to the message base */
+               /* Increment the sequence ID */
+               while (prop = icalcomponent_get_first_property(vevent,
+                     ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+                       i = icalproperty_get_sequence(prop);
+                       if (i > sequence) sequence = i;
+                       icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
+               }
+               ++sequence;
+               icalcomponent_add_property(vevent,
+                       icalproperty_new_sequence(sequence)
+               );
+               
+               /* Set the organizer, only if one does not already exist *and*
+                * the form is supplying one
+                */
+               strcpy(buf, bstr("organizer"));
+               if ( (icalcomponent_get_first_property(vevent,
+                  ICAL_ORGANIZER_PROPERTY) == NULL) 
+                  && (strlen(buf) > 0) ) {
+
+                       /* set new organizer */
+                       sprintf(organizer_string, "MAILTO:%s", buf);
+                       icalcomponent_add_property(vevent,
+                               icalproperty_new_organizer(organizer_string)
+                       );
+
+               }
+
+               /*
+                * Add any new attendees listed in the web form
+                */
+
+               /* First, strip out the parenthesized partstats.  */
+               strcpy(form_attendees, bstr("attendees"));
+               stripout(form_attendees, '(', ')');
+
+               /* Now iterate! */
+               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
+                       extract_token(buf, form_attendees, i, ',');
+                       striplt(buf);
+                       if (strlen(buf) > 0) {
+                               lprintf(9, "Attendee: <%s>\n", buf);
+                               sprintf(attendee_string, "MAILTO:%s", buf);
+                               foundit = 0;
+
+                               for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+                                       if (!strcasecmp(attendee_string,
+                                          icalproperty_get_attendee(attendee)))
+                                               ++foundit;
+                               }
+
+
+                               if (foundit == 0) {
+                                       icalcomponent_add_property(vevent,
+                                               icalproperty_new_attendee(attendee_string)
+                                       );
+                               }
+                       }
+               }
+
+               /*
+                * Remove any attendees *not* listed in the web form
+                */
+STARTOVER:
+               for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+                       strcpy(attendee_string, icalproperty_get_attendee(attendee));
+                       if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+                               strcpy(attendee_string, &attendee_string[7]);
+                               striplt(attendee_string);
+                               foundit = 0;
+                               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
+                                       extract_token(buf, form_attendees, i, ',');
+                                       striplt(buf);
+                                       if (!strcasecmp(buf, attendee_string)) ++foundit;
+                               }
+                               if (foundit == 0) {
+                                       icalcomponent_remove_property(vevent, attendee);
+                                       icalproperty_free(attendee);
+                                       goto STARTOVER;
+                               }
+                       }
+               }
+
+               /*
+                * Serialize it and save it to the message base
+                */
                serv_puts("ENT0 1|||4");
                serv_gets(buf);
                if (buf[0] == '4') {
@@ -438,18 +561,13 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        serv_puts("");
                        serv_puts(icalcomponent_as_ical_string(vevent));
                        serv_puts("000");
-                       delete_existing = 1;
                }
        }
 
        /*
-        * If the user clicked 'Delete' then delete it, period.
+        * If the user clicked 'Delete' then delete it.
         */
-       if (!strcasecmp(bstr("sc"), "Delete")) {
-               delete_existing = 1;
-       }
-
-       if ( (delete_existing) && (msgnum > 0L) ) {
+       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
                serv_gets(buf);
        }