Cleaned up some of the comments ... removed vestiges of last year's doxygen experiment
[citadel.git] / webcit / event.c
index 2767a20fac1d9c974cd7f6ea8108a78a3731d214..2bbf91f6221af9f792d7bdca19e6fd9cc3b40f73 100644 (file)
@@ -2,38 +2,19 @@
  * $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 WEBCIT_WITH_CALENDAR_SERVICE
-
 /*
  * Display an event by itself (for editing)
+ * supplied_vevent     the event to edit
+ * 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, struct calview *calv)
+{
        icalcomponent *vevent;
        icalproperty *p;
        icalvalue *v;
@@ -46,16 +27,55 @@ 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, j = 0;
        int sequence = 0;
+       char weekday_labels[7][32];
+       long weekstart = 0;
+
+       get_pref_long("weekstart", &weekstart, 17);
+       if (weekstart > 6) weekstart = 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")
+       );
+
+       /* populate the weekday names - begin */
+       now = time(NULL);
+       localtime_r(&now, &tm_now);
+       while (tm_now.tm_wday != 0) {
+               now -= 86400L;
+               localtime_r(&now, &tm_now);
+       }
+       for (i=0; i<7; ++i) {
+               localtime_r(&now, &tm_now);
+               wc_strftime(weekday_labels[i], 32, "%A", &tm_now);
+               now += 86400L;
+       }
+       /* populate the weekday names - end */
 
-       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
+                * 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, NULL
+                       );
+                       return;
+               }
        }
        else {
                vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
@@ -69,13 +89,16 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
 
        /* Begin output */
-       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"
-       );
+       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\">");
 
        /************************************************************
         * Uncomment this to see the UID in calendar events for debugging
@@ -84,11 +107,12 @@ 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=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
@@ -101,10 +125,21 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
                bstr("day"));
 
+       char *tabnames[] = {
+               _("Event"),
+               _("Attendees"),
+               _("Recurrence")
+       };
+
+       tabbed_dialog(3, tabnames);
+       begin_tab(0, 3);
+
        /* 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);
@@ -113,7 +148,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);
@@ -122,7 +159,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);
@@ -133,69 +172,50 @@ 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"));
-               if (strlen(bstr("hour")) > 0) {
-                       tm_now.tm_hour = atoi(bstr("hour"));
-                       tm_now.tm_min = atoi(bstr("minute"));
+               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 = 9;
+                       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),
-                       ((!strcasecmp(bstr("alldayevent"), "yes")) ? 1 : 0),
-                       icaltimezone_get_utc_timezone
+                       ((yesbstr("alldayevent")) ? 1 : 0),
+                       icaltimezone_get_utc_timezone()
                );
                t_start.is_utc = 1;
 
        }
-       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;
-                       }
+       display_icaltimetype_as_webform(&t_start, "dtstart", 0);
 
-
-               \" %s >All day event",
-               (t_start.is_date ? "CHECKED" : "" )
+       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");
 
-       /* 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 id=\"dtendcell\">\n");
        if (t_start.is_date) {
                t_end = t_start;
        }
@@ -206,7 +226,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.
                         */
@@ -217,12 +238,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                        /* t_end = icaltime_from_timet(now, 0); */
                }
        }
-       display_icaltimetype_as_webform(&t_end, "dtend");
+       display_icaltimetype_as_webform(&t_end, "dtend", 0);
        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) {
@@ -230,7 +253,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)
@@ -241,31 +265,32 @@ 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");
        }
 
        /*
@@ -281,7 +306,9 @@ 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>");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Show time as:"));
+       wprintf("</B></TD><TD>");
 
        p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
        if (p == NULL) {
@@ -301,32 +328,61 @@ 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>(Separate multiple attendees with commas)"
-               "</FONT></TD><TD>"
-               "<TEXTAREA %s NAME=\"attendees\" wrap=soft "
+
+       /* Done with properties. */
+       wprintf("</TABLE>\n");
+
+       end_tab(0, 3);
+
+       /* Attendees tab (need to move things here) */
+       begin_tab(1, 3);
+       wprintf("<TABLE border=0 width=100%%>\n");      /* same table style as the event tab */
+       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)) {
+       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("");
+                       if (i++) wprintf("\n");
                        escputs(attendee_string);
                        wprintf(" ");
 
@@ -336,48 +392,242 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                }
        }
        wprintf("</TEXTAREA></TD></TR>\n");
+       wprintf("</TABLE>\n");
+       end_tab(1, 3);
 
-       /* Done with properties. */
-       wprintf("</TABLE>\n<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+       /* Recurrence tab */
+       begin_tab(2, 3);
+       icalproperty *rrule = NULL;
+       struct icalrecurrencetype recur;
+
+       rrule = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY);
+       if (rrule) {
+               recur = icalproperty_get_rrule(rrule);
+       }
+       else {
+               /* blank recurrence with some sensible defaults */
+               memset(&recur, 0, sizeof(struct icalrecurrencetype));
+               recur.count = 3;
+               recur.until = icaltime_null_time();
+               recur.interval = 1;
+               recur.freq = ICAL_WEEKLY_RECURRENCE;
+       }
+
+       wprintf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
+               "VALUE=\"yes\" "
+               "onclick=\"RecurrenceShowHide();\""
+               " %s >%s",
+               (rrule ? "CHECKED=\"CHECKED\"" : "" ),
+               _("This is a recurring event")
+       );
+
+       wprintf("<div id=\"rrule_div\">\n");            /* begin 'rrule_div' div */
+
+       wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
+
+       /* Table row displaying raw RRULE data, FIXME remove when finished */
+       if (rrule) {
+               wprintf("<tr><td><b>");
+               wprintf("Raw data");
+               wprintf("</b></td><td>");
+               wprintf("<tt>%s</tt>", icalrecurrencetype_as_string(&recur));
+               wprintf("</td></tr>\n");
+       }
+
+       char *frequency_units[] = {
+               _("seconds"),
+               _("minutes"),
+               _("hours"),
+               _("days"),
+               _("weeks"),
+               _("months"),
+               _("years"),
+               _("never")
+       };
+
+       char *ordinals[] = {
+               "0",
+               _("first"),
+               _("second"),
+               _("third"),
+               _("fourth"),
+               _("fifth")
+       };
+
+       wprintf("<tr><td><b>");
+       wprintf(_("Recurrence rule"));
+       wprintf("</b></td><td>");
+
+       if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
+       wprintf("%s ", _("Repeats every"));
+
+       wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
+       wprintf("value=\"%d\">&nbsp;", recur.interval);
+
+       wprintf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
+               wprintf("<option %s%svalue=\"%d\">%s</option>\n",
+                       ((i == recur.freq) ? "selected " : ""),
+                       (((i == recur.freq) || ((i>=3)&&(i<=5))) ? "" : "disabled "),
+                       i,
+                       frequency_units[i]
+               );
+       }
+       wprintf("</select>\n");
+
+       wprintf("<div id=\"weekday_selector\">");       /* begin 'weekday_selector' div */
+       wprintf("%s<br>", _("on these weekdays:"));
+
+       char weekday_is_selected[7];
+       memset(weekday_is_selected, 0, 7);
+
+       for (i=0; i<ICAL_BY_DAY_SIZE; ++i) {
+               if (recur.by_day[i] == ICAL_RECURRENCE_ARRAY_MAX) {
+                       i = ICAL_RECURRENCE_ARRAY_MAX;                  /* all done */
+               }
+               else {
+                       for (j=0; j<7; ++j) {
+                               if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j+1) {
+                                       weekday_is_selected[j] = 1;
+                               }
+                       }
+               }
+       }
+
+       for (j=0; j<7; ++j) {
+               i = ((j + (int)weekstart) % 7);
+               wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+               if (weekday_is_selected[i]) wprintf(" checked");
+               wprintf(">%s\n", weekday_labels[i]);
+       }
+       wprintf("</div>\n");                            /* end 'weekday_selector' div */
+
+
+       int which_rrmonthtype_is_preselected = 0;       /* FIXME set default correctly */
+
+       wprintf("<div id=\"monthday_selector\">");      /* begin 'monthday_selector' div */
+
+       wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
+       );
+
+       char mdaybox[128];
+       snprintf(mdaybox, sizeof mdaybox,
+               "<input type=\"text\" name=\"rrmday\" id=\"rrmday\" maxlength=\"2\" size=\"2\" "
+               "value=\"%d\">", 0);                    /* FIXME set the correct default */
+       wprintf(_("on day %s of the month"), mdaybox);
+       wprintf("<br />\n");
+
+       wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrmonthtype_is_preselected == 1) ? "checked" : "")
+       );
+
+       wprintf(_("on the "));
+       wprintf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (i=1; i<=5; ++i) {
+               wprintf("<option %svalue=\"%d\">%s</option>\n",
+                       ((0) ? "selected " : ""),                       /* FIXME set correct default */
+                       i,
+                       ordinals[i]
+               );
+       }
+       wprintf("</select> \n");
+
+       wprintf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (j=0; j<7; ++j) {
+               i = ((j + (int)weekstart) % 7);
+               wprintf("<option %svalue=\"%d\">%s</option>\n",
+                       ((0) ? "selected " : ""),                       /* FIXME set correct default */
+                       i,
+                       weekday_labels[i]
+               );
+       }
+       wprintf("</select>");
+
+       wprintf(" %s<br />\n", _("of the month"));
+
+       wprintf("</div>\n");                            /* end 'monthday_selector' div */
+
+
+
+       wprintf("</td></tr>\n");
+
+
+       int which_rrend_is_preselected = 0;
+       if (!icaltime_is_null_time(recur.until)) which_rrend_is_preselected = 2;
+       if (recur.count > 0) which_rrend_is_preselected = 1;
+
+       wprintf("<tr><td><b>");
+       wprintf(_("Recurrence range"));
+       wprintf("</b></td><td>\n");
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 0) ? "checked" : "")
+       );
+       wprintf("%s<br />\n", _("No ending date"));
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 1) ? "checked" : "")
+       );
+       wprintf(_("Repeat this event"));
+       wprintf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+       wprintf("value=\"%d\"> ", recur.count);
+       wprintf(_("times"));
+       wprintf("<br />\n");
+
+       wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
+               "%s onChange=\"RecurrenceShowHide();\">",
+               ((which_rrend_is_preselected == 2) ? "checked" : "")
+       );
+       wprintf(_("Repeat this event until "));
+
+       if (icaltime_is_null_time(recur.until)) {
+               recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
+       }
+       display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
+       wprintf("<br />\n");
+
+       wprintf("</td></tr>\n");
+
+       wprintf("</table>\n");
+       wprintf("</div>\n");                            /* end 'rrule' div */
+
+       end_tab(2, 3);
+
+       /* submit buttons (common area beneath the tabs) */
+       begin_tab(3, 3);
+       wprintf("<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("<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>
-       ");
+       end_tab(3, 3);
+
+       wprintf("</div>\n");                    /* end 'fix_scrollbar_bug' div */
 
+       StrBufAppendPrintf(WC->trailing_javascript,
+               "eventEditAllDay();     \n"
+               "RecurrenceShowHide();  \n"
+       );
+       address_book_popup();
        wDumpContent(1);
 
        if (created_new_vevent) {
@@ -387,17 +637,21 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
 /*
  * Save an edited event
+ *
+ * supplied_vevent:    the event to save
+ * 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, struct calview *calv) {
        char buf[SIZ];
        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;
+       int i, j;
        int foundit;
        char form_attendees[SIZ];
        char organizer_string[SIZ];
@@ -406,13 +660,30 @@ 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
+                * 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, NULL
+                       );
+                       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 */
 
@@ -421,48 +692,57 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        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);
-                       icalproperty_free(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);
-                       icalproperty_free(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);
                }
 
-               if (!strcmp(bstr("alldayevent"), "yes")) {
+               if (yesbstr("alldayevent")) {
                        all_day_event = 1;
                }
                else {
                        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
@@ -471,9 +751,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                 */
                prop = icalproperty_new_dtstart(event_start);
                if (all_day_event) {
-                       icalproperty_set_value(prop,
-                               icalvalue_new_date(event_start)
-                       );
+                       icalproperty_set_value(prop, icalvalue_new_date(event_start));
                }
 
                if (prop) icalcomponent_add_property(vevent, prop);
@@ -491,43 +769,36 @@ 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 */
-               if (strlen(bstr("transp")) > 0) {
-                       lprintf(9, "FORM VALUE: <%s>\n", bstr("transp"));
+               if (havebstr("transp")) {
                        if (!strcasecmp(bstr("transp"), "opaque")) {
                                formtransp = ICAL_TRANSP_OPAQUE;
-                               lprintf(9, "setting to opaque\n");
                        }
                        else if (!strcasecmp(bstr("transp"), "transparent")) {
                                formtransp = ICAL_TRANSP_TRANSPARENT;
-                               lprintf(9, "setting to transparent\n");
                        }
 
                        while (prop = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY),
                              (prop != NULL)) {
-                               lprintf(9, "removing existing property\n");
                                icalcomponent_remove_property(vevent, prop);
                                icalproperty_free(prop);
                        }
 
-                       lprintf(9, "adding new property\n");
                        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);
-                       icalcomponent_add_property(vevent,
-                               icalproperty_new_uid(buf)
-                       );
+                       generate_uuid(buf);
+                       icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
                }
 
                /* Increment the sequence ID */
@@ -543,18 +814,19 @@ 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
                 */
                strcpy(buf, bstr("organizer"));
                if ( (icalcomponent_get_first_property(vevent,
                   ICAL_ORGANIZER_PROPERTY) == NULL) 
-                  && (strlen(buf) > 0) ) {
+                  && (!IsEmptyStr(buf)) ) {
 
                        /* set new organizer */
                        sprintf(organizer_string, "MAILTO:%s", buf);
                        icalcomponent_add_property(vevent,
-                               icalproperty_new_organizer(organizer_string)
+                               icalproperty_new_organizer(organizer_string)
                        );
 
                }
@@ -567,12 +839,22 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                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, ','); ++i) {
-                       extract_token(buf, form_attendees, i, ',');
+               for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+                       extract_token(buf, form_attendees, i, '\n', sizeof buf);
                        striplt(buf);
-                       if (strlen(buf) > 0) {
-                               lprintf(9, "Attendee: <%s>\n", buf);
+                       if (!IsEmptyStr(buf)) {
                                sprintf(attendee_string, "MAILTO:%s", buf);
                                foundit = 0;
 
@@ -594,15 +876,14 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                /*
                 * 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)) {
+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, ',');
+                               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;
                                }
@@ -615,33 +896,72 @@ STARTOVER:
                }
 
                /*
-                * Serialize it and save it to the message base
+                * 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.
                 */
-               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");
+               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);
+                       encaps = NULL;
                }
+
+               /* 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, NULL);
+
+                       icalcomponent_free(encaps);
+                       encaps = NULL;
+               }
+               if (encaps != NULL) {
+                       icalcomponent_free(encaps);
+                       encaps = NULL;
+               }
+
        }
 
        /*
         * If the user clicked 'Delete' then delete it.
         */
-       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
-               serv_printf("DELE %ld", atol(bstr("msgnum")));
-               serv_gets(buf);
+       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 /* WEBCIT_WITH_CALENDAR_SERVICE */