* added gcc printf format checking to wprintf
[citadel.git] / webcit / event.c
index 93632f6a21dac0a322891c65cc3daf6a6e8e0ec2..6a72c0b973499a8e4bc15356e9d30cbf34514c6e 100644 (file)
@@ -2,71 +2,99 @@
  * $Id$
  *
  * Editing calendar events.
- *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
 
-#ifdef HAVE_ICAL_H
-
-
 /*
- * Display an event by itself (for editing)
+ * \brief Display an event by itself (for editing)
+ * \param supplied_vevent the event to edit
+ * \param msgnum reference on the citserver
  */
-void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
        icalcomponent *vevent;
        icalproperty *p;
-       struct icaltimetype t;
+       icalvalue *v;
+       struct icaltimetype t_start, t_end;
        time_t now;
+       struct tm tm_now;
        int created_new_vevent = 0;
+       icalproperty *organizer = NULL;
+       char organizer_string[SIZ];
+       icalproperty *attendee = NULL;
+       char attendee_string[SIZ];
+       char buf[SIZ];
+       int organizer_is_me = 0;
+       int i;
+       int sequence = 0;
+
+       lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
+               msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
+       );
 
        now = time(NULL);
+       strcpy(organizer_string, "");
+       strcpy(attendee_string, "");
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
+               /**
+                * If we're looking at a fully encapsulated VCALENDAR
+                * rather than a VEVENT component, attempt to use the first
+                * relevant VEVENT subcomponent.  If there is none, the
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
+                       display_edit_individual_event(
+                               icalcomponent_get_first_component(
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread
+                       );
+                       return;
+               }
        }
        else {
                vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
                created_new_vevent = 1;
        }
 
-       output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Edit event</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
-       );
+       /** Learn the sequence */
+       p = icalcomponent_get_first_property(vevent, ICAL_SEQUENCE_PROPERTY);
+       if (p != NULL) {
+               sequence = icalproperty_get_sequence(p);
+       }
+
+       /** Begin output */
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
+       wprintf(_("Add or edit an event"));
+       wprintf("</h1>");
+       wprintf("</div>\n");
 
+       wprintf("<div id=\"content\" class=\"service\">\n");
+
+       wprintf("<div class=\"fix_scrollbar_bug\">"
+               "<table  class=\"event_background\"><tr><td>\n");
+
+       /************************************************************
+        * Uncomment this to see the UID in calendar events for debugging
        wprintf("UID == ");
        p = icalcomponent_get_first_property(vevent, ICAL_UID_PROPERTY);
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf(" (FIXME remove this when done)<BR>\n");
+       wprintf("<br />\n");
+       wprintf("SEQUENCE == %d<br />\n", sequence);
+       *************************************************************/
+
+       wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_event\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
@@ -78,10 +106,12 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
                bstr("day"));
 
-       /* Put it in a borderless table so it lines up nicely */
+       /** Put it in a borderless table so it lines up nicely */
        wprintf("<TABLE border=0 width=100%%>\n");
 
-       wprintf("<TR><TD><B>Summary</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Summary"));
+       wprintf("</B></TD><TD>\n"
                "<INPUT TYPE=\"text\" NAME=\"summary\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vevent, ICAL_SUMMARY_PROPERTY);
@@ -90,7 +120,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        wprintf("\"></TD></TR>\n");
 
-       wprintf("<TR><TD><B>Location</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Location"));
+       wprintf("</B></TD><TD>\n"
                "<INPUT TYPE=\"text\" NAME=\"location\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vevent, ICAL_LOCATION_PROPERTY);
@@ -99,49 +131,258 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        wprintf("\"></TD></TR>\n");
 
-       wprintf("<TR><TD><B>Start</B></TD><TD>\n");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Start"));
+       wprintf("</B></TD><TD>\n");
        p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
        if (p != NULL) {
-               t = icalproperty_get_dtstart(p);
+               t_start = icalproperty_get_dtstart(p);
+               if (t_start.is_date) {
+                       t_start.hour = 0;
+                       t_start.minute = 0;
+                       t_start.second = 0;
+               }
        }
        else {
-               t = icaltime_from_timet(now, 0);
+               localtime_r(&now, &tm_now);
+               if (havebstr("year")) {
+                       tm_now.tm_year = ibstr("year") - 1900;
+                       tm_now.tm_mon = ibstr("month") - 1;
+                       tm_now.tm_mday = ibstr("day");
+               }
+               if (havebstr("hour")) {
+                       tm_now.tm_hour = ibstr("hour");
+                       tm_now.tm_min = ibstr("minute");
+                       tm_now.tm_sec = 0;
+               }
+               else {
+                       tm_now.tm_hour = 0;
+                       tm_now.tm_min = 0;
+                       tm_now.tm_sec = 0;
+               }
+
+               t_start = icaltime_from_timet_with_zone(
+                       mktime(&tm_now),
+                       ((yesbstr("alldayevent")) ? 1 : 0),
+                       icaltimezone_get_utc_timezone()
+               );
+               t_start.is_utc = 1;
+
        }
-       display_icaltimetype_as_webform(&t, "dtstart");
+       display_icaltimetype_as_webform(&t_start, "dtstart");
+
+       wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
+               "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
+               " %s >%s",
+               (t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
+               _("All day event")
+       );
+
        wprintf("</TD></TR>\n");
 
-       wprintf("<TR><TD><B>End</B></TD><TD>\n");
-       p = icalcomponent_get_first_property(vevent, ICAL_DTEND_PROPERTY);
-       if (p != NULL) {
-               t = icalproperty_get_dtend(p);
+       /**
+        * If this is an all-day-event, set the end time to be identical to
+        * the start time (the hour/minute/second will be set to midnight).
+        * Otherwise extract or create it.
+        */
+       wprintf("<TR><TD><B>");
+       wprintf(_("End"));
+       wprintf("</B></TD><TD id=\"dtendcell\">\n");
+       if (t_start.is_date) {
+               t_end = t_start;
        }
        else {
-               t = icaltime_from_timet(now, 0);
+               p = icalcomponent_get_first_property(vevent,
+                                                       ICAL_DTEND_PROPERTY);
+               if (p != NULL) {
+                       t_end = icalproperty_get_dtend(p);
+               }
+               else {
+                       /**
+                        * If this is not an all-day event and there is no
+                        * end time specified, make the default one hour
+                        * from the start time.
+                        */
+                       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); */
+               }
        }
-       display_icaltimetype_as_webform(&t, "dtend");
+       display_icaltimetype_as_webform(&t_end, "dtend");
        wprintf("</TD></TR>\n");
 
-       wprintf("<TR><TD><B>Notes</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Notes"));
+       wprintf("</B></TD><TD>\n"
                "<TEXTAREA NAME=\"description\" wrap=soft "
-               "ROWS=10 COLS=80 WIDTH=80>\n"
+               "ROWS=5 COLS=80 WIDTH=80>\n"
        );
        p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf("</TEXTAREA></TD></TR></TABLE>\n");
+       wprintf("</TEXTAREA></TD></TR>");
 
-       wprintf("<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+       /**
+        * For a new event, the user creating the event should be the
+        * organizer.  Set this field accordingly.
+        */
+       if (icalcomponent_get_first_property(vevent, ICAL_ORGANIZER_PROPERTY)
+          == NULL) {
+               sprintf(organizer_string, "MAILTO:%s", WC->cs_inet_email);
+               icalcomponent_add_property(vevent,
+                       icalproperty_new_organizer(organizer_string)
+               );
+       }
+
+       /**
+        * 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);
+       if (organizer != NULL) {
+               strcpy(organizer_string, icalproperty_get_organizer(organizer));
+               if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
+                       strcpy(organizer_string, &organizer_string[7]);
+                       striplt(organizer_string);
+                       serv_printf("ISME %s", organizer_string);
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
+                               organizer_is_me = 1;
+                       }
+               }
+       }
+
+       wprintf("<TR><TD><B>");
+       wprintf(_("Organizer"));
+       wprintf("</B></TD><TD>");
+       escputs(organizer_string);
+       if (organizer_is_me) {
+               wprintf(" <FONT SIZE=-1><I>");
+               wprintf(_("(you are the organizer)"));
+               wprintf("</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");
+
+       /** Transparency */
+       wprintf("<TR><TD><B>");
+       wprintf(_("Show time as:"));
+       wprintf("</B></TD><TD>");
+
+       p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
+       if (p == NULL) {
+               /** No transparency found.  Default to opaque (busy). */
+               p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
+               if (p != NULL) {
+                       icalcomponent_add_property(vevent, p);
+               }
+       }
+       if (p != NULL) {
+               v = icalproperty_get_value(p);
+       }
+       else {
+               v = NULL;
+       }
+
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
+       if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
+               wprintf(" CHECKED");
+       wprintf(">");
+       wprintf(_("Free"));
+       wprintf("&nbsp;&nbsp;");
+
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
+       if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)
+               wprintf(" CHECKED");
+       wprintf(">");
+       wprintf(_("Busy"));
+
+       wprintf("</TD></TR>\n");
+
+       /** Attendees */
+       wprintf("<TR><TD><B>");
+       wprintf(_("Attendees"));
+       wprintf("</B><br />"
+               "<font size=-2>");
+       wprintf(_("(One per line)"));
+       wprintf("</font>\n");
+
+       /** Pop open an address book -- begin **/
+       wprintf(
+               "&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
+               "title=\"%s\">"
+               "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+               "</a>",
+               _("Attendees"),
+               _("Contacts")
+       );
+       /** Pop open an address book -- end **/
+
+       wprintf("</TD><TD>"
+               "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
+               "ROWS=3 COLS=80 WIDTH=80>\n",
+               (organizer_is_me ? "" : "DISABLED ")
+       );
+       i = 0;
+       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("\n");
+                       escputs(attendee_string);
+                       wprintf(" ");
+
+                       /** participant status */
+                       partstat_as_string(buf, attendee);
+                       escputs(buf);
+               }
+       }
+       wprintf("</TEXTAREA></TD></TR>\n");
+
+       /** Done with properties. */
+       wprintf("</TABLE>\n<CENTER>"
+               "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
+               "&nbsp;&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
+               "<INPUT TYPE=\"submit\" NAME=\"check_button\" "
+                               "VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n"
-               "</CENTER>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
+               "</CENTER>\n",
+               _("Save"),
+               _("Delete"),
+               _("Check attendee availability"),
+               _("Cancel")
        );
 
        wprintf("</FORM>\n");
-
+       
+       wprintf("</td></tr></table></div>\n");
+       wprintf("<script type=\"text/javascript\">"
+               "eventEditAllDay();"
+               "</script>\n"
+       );
+       
+       address_book_popup();
        wDumpContent(1);
 
        if (created_new_vevent) {
@@ -149,120 +390,327 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
 }
 
-/*
- * Save an edited event
+/**
+ * \brief Save an edited event
+ * \param supplied_vevent the event to save
+ * \param msgnum the index on the citserver
  */
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
        char buf[SIZ];
-       int delete_existing = 0;
        icalproperty *prop;
-       icalcomponent *vevent;
+       icalcomponent *vevent, *encaps;
        int created_new_vevent = 0;
        int all_day_event = 0;
-       struct icaltimetype event_start;
+       struct icaltimetype event_start, t;
+       icalproperty *attendee = NULL;
+       char attendee_string[SIZ];
+       int i, j;
+       int foundit;
+       char form_attendees[SIZ];
+       char organizer_string[SIZ];
+       int sequence = 0;
+       enum icalproperty_transp formtransp = ICAL_TRANSP_NONE;
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
+               /**
+                * If we're looking at a fully encapsulated VCALENDAR
+                * rather than a VEVENT component, attempt to use the first
+                * relevant VEVENT subcomponent.  If there is none, the
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
+                       save_individual_event(
+                               icalcomponent_get_first_component(
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread
+                       );
+                       return;
+               }
        }
        else {
                vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
                created_new_vevent = 1;
        }
 
-       if (!strcasecmp(bstr("sc"), "Save")) {
+       if ( (havebstr("save_button"))
+          || (havebstr("check_button")) ) {
 
-               /* Replace values in the component with ones from the form */
+               /** Replace values in the component with ones from the form */
 
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_SUMMARY_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
-               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);
-               }
-               icalcomponent_add_property(vevent,
-                       icalproperty_new_location(bstr("location")));
-               
-               while (prop = icalcomponent_get_first_property(vevent,
-                     ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
-                       icalcomponent_remove_property(vevent, prop);
-               }
-               icalcomponent_add_property(vevent,
-                       icalproperty_new_description(bstr("description")));
+
+               if (havebstr("summary")) {
+       
+                       icalcomponent_add_property(vevent,
+                                       icalproperty_new_summary(bstr("summary")));
+               } else {
+                       icalcomponent_add_property(vevent,
+                                       icalproperty_new_summary("Untitled Event"));
+               }
        
+               while (prop = icalcomponent_get_first_property(vevent,
+                                       ICAL_LOCATION_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
+               }
+               if (havebstr("location")) {
+                       icalcomponent_add_property(vevent,
+                                       icalproperty_new_location(bstr("location")));
+               }
+               while (prop = icalcomponent_get_first_property(vevent,
+                                 ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
+               }
+               if (havebstr("description")) {
+                       icalcomponent_add_property(vevent,
+                               icalproperty_new_description(bstr("description")));
+               }
+
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_DTSTART_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
-               event_start = icaltime_from_webform("dtstart");
-               if (event_start.is_date) {
-                       lprintf(9, "*** all day event ***\n");
+
+               if (yesbstr("alldayevent")) {
                        all_day_event = 1;
                }
-               icalcomponent_add_property(vevent,
-                       icalproperty_new_dtstart(event_start)
-               );
-       
+               else {
+                       all_day_event = 0;
+               }
+
+               if (all_day_event) {
+                       icaltime_from_webform_dateonly(&event_start, "dtstart");
+               }
+               else {
+                       icaltime_from_webform(&event_start, "dtstart");
+               }
+
+               /**
+                * The following odd-looking snippet of code looks like it
+                * takes some unnecessary steps.  It is done this way because
+                * libical incorrectly turns an "all day event" into a normal
+                * event starting at midnight (i.e. it serializes as date/time
+                * instead of just date) unless icalvalue_new_date() is used.
+                * So we force it, if this is an all day event.
+                */
+               prop = icalproperty_new_dtstart(event_start);
+               if (all_day_event) {
+                       icalproperty_set_value(prop, icalvalue_new_date(event_start));
+               }
+
+               if (prop) icalcomponent_add_property(vevent, prop);
+               else icalproperty_free(prop);
+
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_DTEND_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_DURATION_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
+
                if (all_day_event == 0) {
+                       icaltime_from_webform(&t, "dtend");     
                        icalcomponent_add_property(vevent,
-                               icalproperty_new_dtend(
-                                       icaltime_from_webform("dtend")
+                               icalproperty_new_dtend(icaltime_normalize(t)
                                )
                        );
                }
 
-               /* Give this event a UID if it doesn't have one. */
+               /** See if transparency is indicated */
+               if (havebstr("transp")) {
+                       if (!strcasecmp(bstr("transp"), "opaque")) {
+                               formtransp = ICAL_TRANSP_OPAQUE;
+                       }
+                       else if (!strcasecmp(bstr("transp"), "transparent")) {
+                               formtransp = ICAL_TRANSP_TRANSPARENT;
+                       }
+
+                       while (prop = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY),
+                             (prop != NULL)) {
+                               icalcomponent_remove_property(vevent, prop);
+                               icalproperty_free(prop);
+                       }
+
+                       icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
+               }
+
+               /** Give this event a UID if it doesn't have one. */
                if (icalcomponent_get_first_property(vevent,
                   ICAL_UID_PROPERTY) == NULL) {
-                       generate_new_uid(buf);
+                       generate_uuid(buf);
+                       icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
+               }
+
+               /** 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) 
+                  && (!IsEmptyStr(buf)) ) {
+
+                       /** set new organizer */
+                       sprintf(organizer_string, "MAILTO:%s", buf);
                        icalcomponent_add_property(vevent,
-                               icalproperty_new_uid(buf)
+                               icalproperty_new_organizer(organizer_string)
                        );
+
                }
-       
-               /* Serialize it and save it to the message base */
-               serv_puts("ENT0 1|||4");
-               serv_gets(buf);
-               if (buf[0] == '4') {
-                       serv_puts("Content-type: text/calendar");
-                       serv_puts("");
-                       serv_puts(icalcomponent_as_ical_string(vevent));
-                       serv_puts("000");
-                       delete_existing = 1;
+
+               /**
+                * Add any new attendees listed in the web form
+                */
+
+               /* First, strip out the parenthesized partstats.  */
+               strcpy(form_attendees, bstr("attendees"));
+               stripout(form_attendees, '(', ')');
+
+               /* Next, change any commas to newlines, because we want newline-separated attendees. */
+               j = strlen(form_attendees);
+               for (i=0; i<j; ++i) {
+                       if (form_attendees[i] == ',') {
+                               form_attendees[i] = '\n';
+                               while (isspace(form_attendees[i+1])) {
+                                       strcpy(&form_attendees[i+1], &form_attendees[i+2]);
+                               }
+                       }
+               }
+
+               /** Now iterate! */
+               for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+                       extract_token(buf, form_attendees, i, '\n', sizeof buf);
+                       striplt(buf);
+                       if (!IsEmptyStr(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, '\n'); ++i) {
+                                       extract_token(buf, form_attendees, i, '\n', sizeof buf);
+                                       striplt(buf);
+                                       if (!strcasecmp(buf, attendee_string)) ++foundit;
+                               }
+                               if (foundit == 0) {
+                                       icalcomponent_remove_property(vevent, attendee);
+                                       icalproperty_free(attendee);
+                                       goto STARTOVER;
+                               }
+                       }
+               }
+
+               /**
+                * Encapsulate event into full VCALENDAR component.  Clone it first,
+                * for two reasons: one, it's easier to just free the whole thing
+                * when we're done instead of unbundling, but more importantly, we
+                * can't encapsulate something that may already be encapsulated
+                * somewhere else.
+                */
+               encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
+
+               /* Set the method to PUBLISH */
+               icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
+
+               /** If the user clicked 'Save' then save it to the server. */
+               if ( (encaps != NULL) && (havebstr("save_button")) ) {
+                       serv_puts("ENT0 1|||4|||1|");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '8') {
+                               serv_puts("Content-type: text/calendar");
+                               serv_puts("");
+                               serv_puts(icalcomponent_as_ical_string(encaps));
+                               serv_puts("000");
+                       }
+                       if ( (buf[0] == '8') || (buf[0] == '4') ) {
+                               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               }
+                       }
+                       if (buf[0] == '2') {
+                               strcpy(WC->ImportantMessage, &buf[4]);
+                       }
+                       icalmemory_free_ring ();
+                       icalcomponent_free(encaps);
+               }
+
+               /** Or, check attendee availability if the user asked for that. */
+               if ( (encaps != NULL) && (havebstr("check_button")) ) {
+
+                       /** Call this function, which does the real work */
+                       check_attendee_availability(encaps);
+
+                       /** This displays the form again, with our annotations */
+                       display_edit_individual_event(encaps, msgnum, from, unread);
+
+                       icalcomponent_free(encaps);
                }
-       }
 
-       /*
-        * If the user clicked 'Delete' then delete it, period.
-        */
-       if (!strcasecmp(bstr("sc"), "Delete")) {
-               delete_existing = 1;
        }
 
-       if ( (delete_existing) && (msgnum > 0L) ) {
-               serv_printf("DELE %ld", atol(bstr("msgnum")));
-               serv_gets(buf);
+       /**
+        * If the user clicked 'Delete' then delete it.
+        */
+       if ( (havebstr("delete_button")) && (msgnum > 0L) ) {
+               serv_printf("DELE %ld", lbstr("msgnum"));
+               serv_getln(buf, sizeof buf);
        }
 
        if (created_new_vevent) {
                icalcomponent_free(vevent);
        }
 
-       /* Go back to the event list */
-       readloop("readfwd");
+       /** If this was a save or delete, go back to the calendar view. */
+       if (!havebstr("check_button")) {
+               readloop("readfwd");
+       }
 }
 
 
-#endif /* HAVE_ICAL_H */