Began making changes to do better handling of character sets.
[citadel.git] / webcit / event.c
index fef2275ab4440e28e4afd12fa682889b7de84ef9..94fac68dbc9d4188cfea0eb40d42ff7728083431 100644 (file)
@@ -1,37 +1,21 @@
 /*
  * $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>
+/**
+ * \defgroup EditCal Editing calendar events.
+ * \ingroup Calendaring
+ */
+/*@{*/
 #include "webcit.h"
 #include "webserver.h"
 
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
 
-/*
- * 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) {
        icalcomponent *vevent;
@@ -46,17 +30,18 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        icalproperty *attendee = NULL;
        char attendee_string[SIZ];
        char buf[SIZ];
-       int i;
        int organizer_is_me = 0;
+       int i;
        int sequence = 0;
 
-       now = time(NULL) % 60;          /* mod 60 to force :00 seconds */
+       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
+               /**
+                * 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
@@ -77,17 +62,54 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                created_new_vevent = 1;
        }
 
-       /* Learn the sequence */
+       /** 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);
-       do_template("beginbox_nt");
-       wprintf("<h3>&nbsp;<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
-               "&nbsp;Add or edit an event</h3>\n");
+       /** Begin output */
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Add or edit an event"));
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<script type=\"text/javascript\">"
+               "function grey_all_day() { "
+                       "if (document.EventForm.alldayevent.checked) {"
+                               "document.EventForm.dtstart_hour.value='0';"
+                               "document.EventForm.dtstart_hour.disabled = true;"
+                               "document.EventForm.dtstart_minute.value='0';"
+                               "document.EventForm.dtstart_minute.disabled = true;"
+                               "document.EventForm.dtend_hour.value='0';"
+                               "document.EventForm.dtend_hour.disabled = true;"
+                               "document.EventForm.dtend_minute.value='0';"
+                               "document.EventForm.dtend_minute.disabled = true;"
+                               "document.EventForm.dtend_month.disabled = true;"
+                               "document.EventForm.dtend_day.disabled = true;"
+                               "document.EventForm.dtend_year.disabled = true;"
+                       "}"
+                       "else {"
+                               "document.EventForm.dtstart_hour.disabled = false;"
+                               "document.EventForm.dtstart_minute.disabled = false;"
+                               "document.EventForm.dtend_hour.disabled = false;"
+                               "document.EventForm.dtend_minute.disabled = false;"
+                               "document.EventForm.dtend_month.disabled = false;"
+                               "document.EventForm.dtend_day.disabled = false;"
+                               "document.EventForm.dtend_year.disabled = false;"
+                       "}"
+               "}"
+               "</script>\n"
+       );
+
+
+       wprintf("<div class=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        /************************************************************
         * Uncomment this to see the UID in calendar events for debugging
@@ -96,11 +118,11 @@ 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("<br />\n");
+       wprintf("SEQUENCE == %d<br />\n", sequence);
        *************************************************************/
 
-       wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" ACTION=\"/save_event\">\n");
+       wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
@@ -113,10 +135,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);
@@ -125,7 +149,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);
@@ -134,7 +160,9 @@ 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_start = icalproperty_get_dtstart(p);
@@ -145,10 +173,12 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                }
        }
        else {
-               memcpy(&tm_now, localtime(&now), sizeof(struct tm));
-               tm_now.tm_year = atoi(bstr("year")) - 1900;
-               tm_now.tm_mon = atoi(bstr("month")) - 1;
-               tm_now.tm_mday = atoi(bstr("day"));
+               localtime_r(&now, &tm_now);
+               if (strlen(bstr("year")) > 0) {
+                       tm_now.tm_year = atoi(bstr("year")) - 1900;
+                       tm_now.tm_mon = atoi(bstr("month")) - 1;
+                       tm_now.tm_mday = atoi(bstr("day"));
+               }
                if (strlen(bstr("hour")) > 0) {
                        tm_now.tm_hour = atoi(bstr("hour"));
                        tm_now.tm_min = atoi(bstr("minute"));
@@ -171,43 +201,22 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        display_icaltimetype_as_webform(&t_start, "dtstart");
 
        wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
-               "VALUE=\"yes\" onClick=\"
-
-                       if (this.checked) {
-                               this.form.dtstart_hour.value='0';
-                               this.form.dtstart_hour.disabled = true;
-                               this.form.dtstart_minute.value='0';
-                               this.form.dtstart_minute.disabled = true;
-                               this.form.dtend_hour.value='0';
-                               this.form.dtend_hour.disabled = true;
-                               this.form.dtend_minute.value='0';
-                               this.form.dtend_minute.disabled = true;
-                               this.form.dtend_month.disabled = true;
-                               this.form.dtend_day.disabled = true;
-                               this.form.dtend_year.disabled = true;
-                       }
-                       else {
-                               this.form.dtstart_hour.disabled = false;
-                               this.form.dtstart_minute.disabled = false;
-                               this.form.dtend_hour.disabled = false;
-                               this.form.dtend_minute.disabled = false;
-                               this.form.dtend_month.disabled = false;
-                               this.form.dtend_day.disabled = false;
-                               this.form.dtend_year.disabled = false;
-                       }
-
-
-               \" %s >All day event",
-               (t_start.is_date ? "CHECKED" : "" )
+               "VALUE=\"yes\" onClick=\"grey_all_day();\""
+               " %s >%s",
+               (t_start.is_date ? "CHECKED" : "" ),
+               _("All day event")
        );
 
        wprintf("</TD></TR>\n");
 
-       /* If this is an all-day-event, set the end time to be identical to
+       /**
+        * 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>End</B></TD><TD>\n");
+       wprintf("<TR><TD><B>");
+       wprintf(_("End"));
+       wprintf("</B></TD><TD>\n");
        if (t_start.is_date) {
                t_end = t_start;
        }
@@ -218,7 +227,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                        t_end = icalproperty_get_dtend(p);
                }
                else {
-                       /* If this is not an all-day event and there is no
+                       /**
+                        * If this is not an all-day event and there is no
                         * end time specified, make the default one hour
                         * from the start time.
                         */
@@ -232,7 +242,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        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=5 COLS=80 WIDTH=80>\n"
        );
@@ -242,7 +254,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        wprintf("</TEXTAREA></TD></TR>");
 
-       /* For a new event, the user creating the event should be the
+       /**
+        * 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)
@@ -253,34 +266,35 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                );
        }
 
-       /* Determine who is the organizer of this event.
+       /**
+        * 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);
+       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);
-                       lprintf(9, "ISME %s\n", organizer_string);
                        serv_printf("ISME %s", organizer_string);
-                       serv_gets(buf);
-                       lprintf(9, "%s\n", buf);
+                       serv_getln(buf, sizeof buf);
                        if (buf[0] == '2') {
                                organizer_is_me = 1;
                        }
                }
        }
 
-       wprintf("<TR><TD><B>Organizer</B></TD><TD>");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Organizer"));
+       wprintf("</B></TD><TD>");
        escputs(organizer_string);
        if (organizer_is_me) {
-               wprintf(" <FONT SIZE=-1><I>"
-                       "(you are the organizer)</I></FONT>\n");
+               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
@@ -292,12 +306,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        wprintf("</TD></TR>\n");
 
-       /* Transparency */
-       wprintf("<TR><TD><B>Show time as:</B></TD><TD>");
+       /** 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). */
+               /** No transparency found.  Default to opaque (busy). */
                p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
                if (p != NULL) {
                        icalcomponent_add_property(vevent, p);
@@ -313,19 +329,25 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
        if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
                wprintf(" CHECKED");
-       wprintf(">Free&nbsp;&nbsp;");
+       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(">Busy");
+       wprintf(">");
+       wprintf(_("Busy"));
 
        wprintf("</TD></TR>\n");
 
-       /* Attendees */
-       wprintf("<TR><TD><B>Attendees</B><BR>"
-               "<FONT SIZE=-2>(One per line)"
-               "</FONT></TD><TD>"
+       /** Attendees */
+       wprintf("<TR><TD><B>");
+       wprintf(_("Attendees"));
+       wprintf("</B><br />"
+               "<FONT SIZE=-2>");
+       wprintf(_("(One per line)"));
+       wprintf("</FONT></TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" wrap=soft "
                "ROWS=3 COLS=80 WIDTH=80>\n",
                (organizer_is_me ? "" : "DISABLED ")
@@ -337,64 +359,44 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                strcpy(attendee_string, icalproperty_get_attendee(attendee));
                if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
 
-                       /* screen name or email address */
+                       /** screen name or email address */
                        strcpy(attendee_string, &attendee_string[7]);
                        striplt(attendee_string);
                        if (i++) wprintf("\n");
                        escputs(attendee_string);
                        wprintf(" ");
 
-                       /* participant status */
+                       /** participant status */
                        partstat_as_string(buf, attendee);
                        escputs(buf);
                }
        }
        wprintf("</TEXTAREA></TD></TR>\n");
 
-       /* Done with properties. */
+       /** Done with properties. */
        wprintf("</TABLE>\n<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+               "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
+               "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Check attendee availability\">\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("<SCRIPT language=\"javascript\">"
-               "<!--"
-                       "if (document.EventForm.alldayevent.checked) {"
-                               "document.EventForm.dtstart_hour.value='0';"
-                               "document.EventForm.dtstart_hour.disabled = true;"
-                               "document.EventForm.dtstart_minute.value='0';"
-                               "document.EventForm.dtstart_minute.disabled = true;"
-                               "document.EventForm.dtend_hour.value='0';"
-                               "document.EventForm.dtend_hour.disabled = true;"
-                               "document.EventForm.dtend_minute.value='0';"
-                               "document.EventForm.dtend_minute.disabled = true;"
-                               "document.EventForm.dtend_month.disabled = true;"
-                               "document.EventForm.dtend_day.disabled = true;"
-                               "document.EventForm.dtend_year.disabled = true;"
-                       "}"
-                       "else {"
-                               "document.EventForm.dtstart_hour.disabled = false;"
-                               "document.EventForm.dtstart_minute.disabled = false;"
-                               "document.EventForm.dtend_hour.disabled = false;"
-                               "document.EventForm.dtend_minute.disabled = false;"
-                               "document.EventForm.dtend_month.disabled = false;"
-                               "document.EventForm.dtend_day.disabled = false;"
-                               "document.EventForm.dtend_year.disabled = false;"
-                       "}"
-               "//-->"
-               "</SCRIPT>\n"
+       wprintf("</td></tr></table></div>\n");
+       wprintf("<script type=\"text/javascript\">"
+               "grey_all_day();"
+               "</script>\n"
        );
-
-       do_template("endbox");
        wDumpContent(1);
 
        if (created_new_vevent) {
@@ -402,9 +404,10 @@ 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) {
        char buf[SIZ];
@@ -412,7 +415,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        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;
@@ -424,7 +427,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
-               /* If we're looking at a fully encapsulated VCALENDAR
+               /**
+                * 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
@@ -445,10 +449,10 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                created_new_vevent = 1;
        }
 
-       if ( (!strcasecmp(bstr("sc"), "Save"))
-          || (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+       if ( (strlen(bstr("save_button")) > 0)
+          || (strlen(bstr("check_button")) > 0) ) {
 
-               /* 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) {
@@ -487,16 +491,15 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        all_day_event = 0;
                }
 
-               event_start = icaltime_from_webform("dtstart");
                if (all_day_event) {
-                       event_start.is_date = 1;
-                       event_start.hour = 0;
-                       event_start.minute = 0;
-                       event_start.second = 0;
+                       icaltime_from_webform_dateonly(&event_start, "dtstart");
+               }
+               else {
+                       icaltime_from_webform(&event_start, "dtstart");
                }
 
-
-               /* The following odd-looking snippet of code looks like it
+               /**
+                * 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
@@ -525,14 +528,14 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                }
 
                if (all_day_event == 0) {
+                       icaltime_from_webform(&t, "dtend");     
                        icalcomponent_add_property(vevent,
-                               icalproperty_new_dtend(icaltime_normalize(
-                                       icaltime_from_webform("dtend"))
+                               icalproperty_new_dtend(icaltime_normalize(t)
                                )
                        );
                }
 
-               /* See if transparency is indicated */
+               /** See if transparency is indicated */
                if (strlen(bstr("transp")) > 0) {
                        if (!strcasecmp(bstr("transp"), "opaque")) {
                                formtransp = ICAL_TRANSP_OPAQUE;
@@ -552,17 +555,17 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        lprintf(9, "...added it.\n");
                }
 
-               /* Give this event a UID if it doesn't have one. */
+               /** Give this event a UID if it doesn't have one. */
                lprintf(9, "Give this event a UID if it doesn't have one.\n");
                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 */
+               /** Increment the sequence ID */
                lprintf(9, "Increment the sequence ID\n");
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
@@ -578,7 +581,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalproperty_new_sequence(sequence)
                );
                
-               /* Set the organizer, only if one does not already exist *and*
+               /**
+                * Set the organizer, only if one does not already exist *and*
                 * the form is supplying one
                 */
                lprintf(9, "Setting the organizer...\n");
@@ -587,7 +591,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                   ICAL_ORGANIZER_PROPERTY) == NULL) 
                   && (strlen(buf) > 0) ) {
 
-                       /* set new organizer */
+                       /** set new organizer */
                        sprintf(organizer_string, "MAILTO:%s", buf);
                        icalcomponent_add_property(vevent,
                                icalproperty_new_organizer(organizer_string)
@@ -595,7 +599,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 
                }
 
-               /*
+               /**
                 * Add any new attendees listed in the web form
                 */
                lprintf(9, "Add any new attendees\n");
@@ -604,9 +608,9 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                strcpy(form_attendees, bstr("attendees"));
                stripout(form_attendees, '(', ')');
 
-               /* Now iterate! */
+               /** Now iterate! */
                for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
-                       extract_token(buf, form_attendees, i, '\n');
+                       extract_token(buf, form_attendees, i, '\n', sizeof buf);
                        striplt(buf);
                        if (strlen(buf) > 0) {
                                lprintf(9, "Attendee: <%s>\n", buf);
@@ -628,7 +632,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        }
                }
 
-               /*
+               /**
                 * Remove any attendees *not* listed in the web form
                 */
 STARTOVER:     lprintf(9, "Remove unlisted attendees\n");
@@ -639,7 +643,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
                                striplt(attendee_string);
                                foundit = 0;
                                for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
-                                       extract_token(buf, form_attendees, i, '\n');
+                                       extract_token(buf, form_attendees, i, '\n', sizeof buf);
                                        striplt(buf);
                                        if (!strcasecmp(buf, attendee_string)) ++foundit;
                                }
@@ -651,7 +655,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
                        }
                }
 
-               /*
+               /**
                 * 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
@@ -661,27 +665,30 @@ STARTOVER:        lprintf(9, "Remove unlisted attendees\n");
                lprintf(9, "Encapsulating into full VCALENDAR component\n");
                encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
 
-               /* If the user clicked 'Save' then save it to the server. */
+               /** If the user clicked 'Save' then save it to the server. */
                lprintf(9, "Serializing it for saving\n");
-               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Save")) ) {
-                       serv_puts("ENT0 1|||4");
-                       serv_gets(buf);
-                       if (buf[0] == '4') {
+               if ( (encaps != NULL) && (strlen(bstr("save_button")) > 0) ) {
+                       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");
                        }
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               lprintf(9, "ENT0 REPLY: %s\n", buf);
+                       }
                        icalcomponent_free(encaps);
                }
 
-               /* Or, check attendee availability if the user asked for that. */
-               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+               /** Or, check attendee availability if the user asked for that. */
+               if ( (encaps != NULL) && (strlen(bstr("check_button")) > 0) ) {
 
-                       /* Call this function, which does the real work */
+                       /** Call this function, which does the real work */
                        check_attendee_availability(encaps);
 
-                       /* This displays the form again, with our annotations */
+                       /** This displays the form again, with our annotations */
                        display_edit_individual_event(encaps, msgnum);
 
                        icalcomponent_free(encaps);
@@ -689,24 +696,26 @@ STARTOVER:        lprintf(9, "Remove unlisted attendees\n");
 
        }
 
-       /*
+       /**
         * If the user clicked 'Delete' then delete it.
         */
        lprintf(9, "Checking to see if we have to delete an old event\n");
-       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
+       if ( (strlen(bstr("delete_button")) > 0) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        }
 
        if (created_new_vevent) {
                icalcomponent_free(vevent);
        }
 
-       /* If this was a save or deelete, go back to the calendar view. */
-       if (strcasecmp(bstr("sc"), "Check attendee availability")) {
+       /** If this was a save or deelete, go back to the calendar view. */
+       if (strlen(bstr("check_button")) == 0) {
                readloop("readfwd");
        }
 }
 
 
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
+
+/*@}*/