]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
Big change to calendar view functions. We now declare
[citadel.git] / webcit / event.c
index 859c4d5ea1e30162a53386502713e610835d6e14..64ea2270737829cce3287a6f4550028327d8b9e0 100644 (file)
@@ -1,23 +1,20 @@
 /*
  * $Id$
+ *
+ * Editing calendar events.
  */
-/**
- * \defgroup EditCal Editing calendar events.
- * \ingroup Calendaring
- */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 
-
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
- * \brief Display an event by itself (for editing)
- * \param supplied_vevent the event to edit
- * \param msgnum reference on the citserver
+/*
+ * 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;
@@ -31,20 +28,39 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        char attendee_string[SIZ];
        char buf[SIZ];
        int organizer_is_me = 0;
-       int i;
+       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);
        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
@@ -55,8 +71,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
                        display_edit_individual_event(
                                icalcomponent_get_first_component(
-                                       vevent, ICAL_VEVENT_COMPONENT
-                               ), msgnum
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread, NULL
                        );
                        return;
                }
@@ -66,13 +82,13 @@ 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 */
+       /* Begin output */
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
        wprintf("<h1>");
@@ -82,37 +98,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        wprintf("<div id=\"content\" class=\"service\">\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  class=\"event_background\"><tr><td>\n");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
        /************************************************************
         * Uncomment this to see the UID in calendar events for debugging
@@ -126,7 +112,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        *************************************************************/
 
        wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
@@ -139,7 +125,16 @@ 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 */
+       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>");
@@ -178,14 +173,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        else {
                localtime_r(&now, &tm_now);
-               if (!IsEmptyStr(bstr("year"))) {
-                       tm_now.tm_year = atoi(bstr("year")) - 1900;
-                       tm_now.tm_mon = atoi(bstr("month")) - 1;
-                       tm_now.tm_mday = atoi(bstr("day"));
-               }
-               if (!IsEmptyStr(bstr("hour"))) {
-                       tm_now.tm_hour = atoi(bstr("hour"));
-                       tm_now.tm_min = atoi(bstr("minute"));
+               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 {
@@ -196,31 +191,31 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
                t_start = icaltime_from_timet_with_zone(
                        mktime(&tm_now),
-                       ((!strcasecmp(bstr("alldayevent"), "yes")) ? 1 : 0),
+                       ((yesbstr("alldayevent")) ? 1 : 0),
                        icaltimezone_get_utc_timezone()
                );
                t_start.is_utc = 1;
 
        }
-       display_icaltimetype_as_webform(&t_start, "dtstart");
+       display_icaltimetype_as_webform(&t_start, "dtstart", 0);
 
-       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
-               "VALUE=\"yes\" onClick=\"grey_all_day();\""
+       wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
+               "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
                " %s >%s",
-               (t_start.is_date ? "CHECKED" : "" ),
+               (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
         * 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>\n");
+       wprintf("</B></TD><TD id=\"dtendcell\">\n");
        if (t_start.is_date) {
                t_end = t_start;
        }
@@ -231,19 +226,19 @@ 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
                         * end time specified, make the default one hour
                         * from the start time.
                         */
                        t_end = t_start;
-                       t_end.hour += 0;
+                       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_end, "dtend");
+       display_icaltimetype_as_webform(&t_end, "dtend", 0);
        wprintf("</TD></TR>\n");
 
        wprintf("<TR><TD><B>");
@@ -345,7 +340,15 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        wprintf("</TD></TR>\n");
 
-       /** Attendees */
+
+       /** 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 />"
@@ -362,7 +365,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                _("Attendees"),
                _("Contacts")
        );
-       /** Pop open an address book -- end **/
+       /* Pop open an address book -- end **/
 
        wprintf("</TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
@@ -389,9 +392,218 @@ 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>"
+       /* 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"
@@ -406,15 +618,15 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                _("Check attendee availability"),
                _("Cancel")
        );
-
        wprintf("</FORM>\n");
-       
-       wprintf("</td></tr></table></div>\n");
-       wprintf("<script type=\"text/javascript\">"
-               "grey_all_day();"
-               "</script>\n"
+       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);
 
@@ -423,12 +635,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
 }
 
-/**
- * \brief Save an edited event
- * \param supplied_vevent the event to save
- * \param msgnum the index on the citserver
+/*
+ * 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, *encaps;
@@ -457,8 +671,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
                        save_individual_event(
                                icalcomponent_get_first_component(
-                                       vevent, ICAL_VEVENT_COMPONENT
-                               ), msgnum
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread, NULL
                        );
                        return;
                }
@@ -468,8 +682,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                created_new_vevent = 1;
        }
 
-       if ( (!IsEmptyStr(bstr("save_button")))
-          || (!IsEmptyStr(bstr("check_button"))) ) {
+       if ( (havebstr("save_button"))
+          || (havebstr("check_button")) ) {
 
                /** Replace values in the component with ones from the form */
 
@@ -479,7 +693,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalproperty_free(prop);
                }
 
-               if (!IsEmptyStr(bstr("summary"))) {
+               if (havebstr("summary")) {
        
                        icalcomponent_add_property(vevent,
                                        icalproperty_new_summary(bstr("summary")));
@@ -493,7 +707,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalcomponent_remove_property(vevent, prop);
                        icalproperty_free(prop);
                }
-               if (!IsEmptyStr(bstr("location"))) {
+               if (havebstr("location")) {
                        icalcomponent_add_property(vevent,
                                        icalproperty_new_location(bstr("location")));
                }
@@ -502,7 +716,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalcomponent_remove_property(vevent, prop);
                        icalproperty_free(prop);
                }
-               if (!IsEmptyStr(bstr("description"))) {
+               if (havebstr("description")) {
                        icalcomponent_add_property(vevent,
                                icalproperty_new_description(bstr("description")));
                }
@@ -513,7 +727,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalproperty_free(prop);
                }
 
-               if (!strcmp(bstr("alldayevent"), "yes")) {
+               if (yesbstr("alldayevent")) {
                        all_day_event = 1;
                }
                else {
@@ -563,7 +777,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                }
 
                /** See if transparency is indicated */
-               if (!IsEmptyStr(bstr("transp"))) {
+               if (havebstr("transp")) {
                        if (!strcasecmp(bstr("transp"), "opaque")) {
                                formtransp = ICAL_TRANSP_OPAQUE;
                        }
@@ -694,7 +908,7 @@ STARTOVER:  for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
                /** If the user clicked 'Save' then save it to the server. */
-               if ( (encaps != NULL) && (!IsEmptyStr(bstr("save_button"))) ) {
+               if ( (encaps != NULL) && (havebstr("save_button")) ) {
                        serv_puts("ENT0 1|||4|||1|");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '8') {
@@ -710,28 +924,35 @@ STARTOVER:        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        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) && (!IsEmptyStr(bstr("check_button"))) ) {
+               if ( (encaps != NULL) && (havebstr("check_button")) ) {
 
-                       /** 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 */
-                       display_edit_individual_event(encaps, msgnum);
+                       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 ( (!IsEmptyStr(bstr("delete_button"))) && (msgnum > 0L) ) {
-               serv_printf("DELE %ld", atol(bstr("msgnum")));
+       if ( (havebstr("delete_button")) && (msgnum > 0L) ) {
+               serv_printf("DELE %ld", lbstr("msgnum"));
                serv_getln(buf, sizeof buf);
        }
 
@@ -739,13 +960,8 @@ STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                icalcomponent_free(vevent);
        }
 
-       /** If this was a save or delete, go back to the calendar view. */
-       if (IsEmptyStr(bstr("check_button"))) {
+       /* If this was a save or delete, go back to the calendar view. */
+       if (!havebstr("check_button")) {
                readloop("readfwd");
        }
 }
-
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/*@}*/