* Prettied up the calendar day view layout

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index 990a06b2f2884bee6ecab604cced6966166846bb..0cca6db2a05e28a7b4c00c0a8a39c8dc698276a8 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -219,8 +219,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);
@@ -242,6 +242,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) */
@@ -317,12 +328,17 @@ 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];
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
@@ -368,7 +384,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 +445,75 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        );
                }
 
-               /* Serialize it and save it to the message base */
+               /* 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
+                */
+               strcpy(form_attendees, bstr("attendees"));
+               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 +521,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);
        }