* event.c: fixed a misspelling
[citadel.git] / webcit / event.c
index 70d9a64030fda3055d5d9fd9cd6d5946c5b23aa0..2767a20fac1d9c974cd7f6ea8108a78a3731d214 100644 (file)
@@ -28,8 +28,7 @@
 #include "webserver.h"
 
 
-#ifdef HAVE_ICAL_H
-
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
 
 /*
  * Display an event by itself (for editing)
 void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        icalcomponent *vevent;
        icalproperty *p;
-       struct icaltimetype t;
+       icalvalue *v;
+       struct icaltimetype t_start, t_end;
        time_t now;
+       struct tm tm_now;
        int created_new_vevent = 0;
+       icalproperty *organizer = NULL;
+       char organizer_string[SIZ];
+       icalproperty *attendee = NULL;
+       char attendee_string[SIZ];
+       char buf[SIZ];
+       int i;
+       int organizer_is_me = 0;
+       int sequence = 0;
 
-       now = time(NULL);
+       now = time(NULL) % 60;  /* mod 60 to force :00 seconds */
+       strcpy(organizer_string, "");
+       strcpy(attendee_string, "");
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
@@ -51,14 +62,34 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                created_new_vevent = 1;
        }
 
+       /* 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);
        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"
        );
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_event\">\n");
+       /************************************************************
+        * Uncomment this to see the UID in calendar events for debugging
+       wprintf("UID == ");
+       p = icalcomponent_get_first_property(vevent, ICAL_UID_PROPERTY);
+       if (p != NULL) {
+               escputs((char *)icalproperty_get_comment(p));
+       }
+       wprintf("<BR>\n");
+       wprintf("SEQUENCE == %d<BR>\n", sequence);
+       *************************************************************/
+
+       wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" ACTION=\"/save_event\">\n");
+
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
@@ -70,36 +101,245 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
                bstr("day"));
 
-       wprintf("Summary: "
+       /* 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"
                "<INPUT TYPE=\"text\" NAME=\"summary\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vevent, ICAL_SUMMARY_PROPERTY);
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf("\"><BR>\n");
+       wprintf("\"></TD></TR>\n");
 
-       wprintf("Start date: ");
+       wprintf("<TR><TD><B>Location</B></TD><TD>\n"
+               "<INPUT TYPE=\"text\" NAME=\"location\" "
+               "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
+       p = icalcomponent_get_first_property(vevent, ICAL_LOCATION_PROPERTY);
+       if (p != NULL) {
+               escputs((char *)icalproperty_get_comment(p));
+       }
+       wprintf("\"></TD></TR>\n");
+
+       wprintf("<TR><TD><B>Start</B></TD><TD>\n");
        p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
        if (p != NULL) {
-               t = icalproperty_get_dtstart(p);
+               t_start = icalproperty_get_dtstart(p);
+               if (t_start.is_date) {
+                       t_start.hour = 0;
+                       t_start.minute = 0;
+                       t_start.second = 0;
+               }
        }
        else {
-               t = icaltime_from_timet(now, 0);
+               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"));
+                       tm_now.tm_sec = 0;
+               }
+               else {
+                       tm_now.tm_hour = 9;
+                       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
+               );
+               t_start.is_utc = 1;
+
        }
-       display_icaltimetype_as_webform(&t, "dtstart");
-       wprintf("<BR>\n");
+       display_icaltimetype_as_webform(&t_start, "dtstart");
 
-       wprintf("<CENTER><TEXTAREA NAME=\"description\" wrap=soft "
+       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" : "" )
+       );
+
+       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>End</B></TD><TD>\n");
+       if (t_start.is_date) {
+               t_end = t_start;
+       }
+       else {
+               p = icalcomponent_get_first_property(vevent,
+                                                       ICAL_DTEND_PROPERTY);
+               if (p != NULL) {
+                       t_end = icalproperty_get_dtend(p);
+               }
+               else {
+                       /* If this is not an all-day event and there is no
+                        * end time specified, make the default one hour
+                        * from the start time.
+                        */
+                       t_end = t_start;
+                       t_end.hour += 1;
+                       t_end.second = 0;
+                       t_end = icaltime_normalize(t_end);
+                       /* t_end = icaltime_from_timet(now, 0); */
+               }
+       }
+       display_icaltimetype_as_webform(&t_end, "dtend");
+       wprintf("</TD></TR>\n");
+
+       wprintf("<TR><TD><B>Notes</B></TD><TD>\n"
+               "<TEXTAREA NAME=\"description\" wrap=soft "
                "ROWS=10 COLS=80 WIDTH=80>\n"
        );
        p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf("</TEXTAREA><BR>\n");
+       wprintf("</TEXTAREA></TD></TR>");
+
+       /* For a new event, the user creating the event should be the
+        * organizer.  Set this field accordingly.
+        */
+       if (icalcomponent_get_first_property(vevent, ICAL_ORGANIZER_PROPERTY)
+          == NULL) {
+               sprintf(organizer_string, "MAILTO:%s", WC->cs_inet_email);
+               icalcomponent_add_property(vevent,
+                       icalproperty_new_organizer(organizer_string)
+               );
+       }
+
+       /* Determine who is the organizer of this event.
+        * We need to determine "me" or "not me."
+        */
+       organizer = icalcomponent_get_first_property(vevent,
+                                               ICAL_ORGANIZER_PROPERTY);
+       if (organizer != NULL) {
+               strcpy(organizer_string, icalproperty_get_organizer(organizer));
+               if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
+                       strcpy(organizer_string, &organizer_string[7]);
+                       striplt(organizer_string);
+                       lprintf(9, "ISME %s\n", organizer_string);
+                       serv_printf("ISME %s", organizer_string);
+                       serv_gets(buf);
+                       lprintf(9, "%s\n", buf);
+                       if (buf[0] == '2') {
+                               organizer_is_me = 1;
+                       }
+               }
+       }
+
+       wprintf("<TR><TD><B>Organizer</B></TD><TD>");
+       escputs(organizer_string);
+       if (organizer_is_me) {
+               wprintf(" <FONT SIZE=-1><I>"
+                       "(you are the organizer)</I></FONT>\n");
+       }
+
+       /*
+        * Transmit the organizer as a hidden field.   We don't want the user
+        * to be able to change it, but we do want it fed back to the server,
+        * especially if this is a new event and there is no organizer already
+        * in the calendar object.
+        */
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"organizer\" VALUE=\"");
+       escputs(organizer_string);
+       wprintf("\">");
+
+       wprintf("</TD></TR>\n");
+
+       /* Transparency */
+       wprintf("<TR><TD><B>Show time as:</B></TD><TD>");
+
+       p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
+       if (p == NULL) {
+               /* No transparency found.  Default to opaque (busy). */
+               p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
+               if (p != NULL) {
+                       icalcomponent_add_property(vevent, p);
+               }
+       }
+       if (p != NULL) {
+               v = icalproperty_get_value(p);
+       }
+       else {
+               v = NULL;
+       }
+
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
+       if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
+               wprintf(" CHECKED");
+       wprintf(">Free&nbsp;&nbsp;");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
+       if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)
+               wprintf(" CHECKED");
+       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 "
+               "ROWS=3 COLS=80 WIDTH=80>\n",
+               (organizer_is_me ? "" : "DISABLED ")
+       );
+       i = 0;
+       for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+               strcpy(attendee_string, icalproperty_get_attendee(attendee));
+               if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+
+                       /* screen name or email address */
+                       strcpy(attendee_string, &attendee_string[7]);
+                       striplt(attendee_string);
+                       if (i++) wprintf(", ");
+                       escputs(attendee_string);
+                       wprintf(" ");
+
+                       /* participant status */
+                       partstat_as_string(buf, attendee);
+                       escputs(buf);
+               }
+       }
+       wprintf("</TEXTAREA></TD></TR>\n");
+
+       /* Done with properties. */
+       wprintf("</TABLE>\n<CENTER>"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
                "&nbsp;&nbsp;"
@@ -108,6 +348,35 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        );
 
        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>
+       ");
 
        wDumpContent(1);
 
@@ -121,10 +390,19 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
  */
 void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        char buf[SIZ];
-       int delete_existing = 0;
        icalproperty *prop;
        icalcomponent *vevent;
        int created_new_vevent = 0;
+       int all_day_event = 0;
+       struct icaltimetype event_start;
+       icalproperty *attendee = NULL;
+       char attendee_string[SIZ];
+       int i;
+       int foundit;
+       char form_attendees[SIZ];
+       char organizer_string[SIZ];
+       int sequence = 0;
+       enum icalproperty_transp formtransp = ICAL_TRANSP_NONE;
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
@@ -141,13 +419,23 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_SUMMARY_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
                icalcomponent_add_property(vevent,
                        icalproperty_new_summary(bstr("summary")));
+
+               while (prop = icalcomponent_get_first_property(vevent,
+                     ICAL_LOCATION_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vevent, prop);
+                       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")));
@@ -155,24 +443,180 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                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")) {
+                       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;
+               }
+
+
+               /* The following odd-looking snippet of code looks like it
+                * takes some unnecessary steps.  It is done this way because
+                * libical incorrectly turns an "all day event" into a normal
+                * event starting at midnight (i.e. it serializes as date/time
+                * instead of just date) unless icalvalue_new_date() is used.
+                * So we force it, if this is an all day event.
+                */
+               prop = icalproperty_new_dtstart(event_start);
+               if (all_day_event) {
+                       icalproperty_set_value(prop,
+                               icalvalue_new_date(event_start)
+                       );
+               }
+
+               if (prop) icalcomponent_add_property(vevent, prop);
+               else icalproperty_free(prop);
+
+               while (prop = icalcomponent_get_first_property(vevent,
+                     ICAL_DTEND_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
                }
-               icalcomponent_add_property(vevent,
-                       icalproperty_new_dtstart(
-                               icaltime_from_webform("dtstart")
-                       )
-               );
-       
                while (prop = icalcomponent_get_first_property(vevent,
-                     ICAL_DUE_PROPERTY), prop != NULL) {
+                     ICAL_DURATION_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
+               }
+
+               if (all_day_event == 0) {
+                       icalcomponent_add_property(vevent,
+                               icalproperty_new_dtend(icaltime_normalize(
+                                       icaltime_from_webform("dtend"))
+                               )
+                       );
+               }
+
+               /* See if transparency is indicated */
+               if (strlen(bstr("transp")) > 0) {
+                       lprintf(9, "FORM VALUE: <%s>\n", bstr("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)
+                       );
+               }
+
+               /* Increment the sequence ID */
+               while (prop = icalcomponent_get_first_property(vevent,
+                     ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+                       i = icalproperty_get_sequence(prop);
+                       if (i > sequence) sequence = i;
+                       icalcomponent_remove_property(vevent, prop);
+                       icalproperty_free(prop);
+               }
+               ++sequence;
                icalcomponent_add_property(vevent,
-                       icalproperty_new_due(
-                               icaltime_from_webform("due")
-                       )
+                       icalproperty_new_sequence(sequence)
                );
-       
-               /* Serialize it and save it to the message base */
+               
+               /* Set the organizer, only if one does not already exist *and*
+                * the form is supplying one
+                */
+               strcpy(buf, bstr("organizer"));
+               if ( (icalcomponent_get_first_property(vevent,
+                  ICAL_ORGANIZER_PROPERTY) == NULL) 
+                  && (strlen(buf) > 0) ) {
+
+                       /* set new organizer */
+                       sprintf(organizer_string, "MAILTO:%s", buf);
+                       icalcomponent_add_property(vevent,
+                               icalproperty_new_organizer(organizer_string)
+                       );
+
+               }
+
+               /*
+                * Add any new attendees listed in the web form
+                */
+
+               /* First, strip out the parenthesized partstats.  */
+               strcpy(form_attendees, bstr("attendees"));
+               stripout(form_attendees, '(', ')');
+
+               /* Now iterate! */
+               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
+                       extract_token(buf, form_attendees, i, ',');
+                       striplt(buf);
+                       if (strlen(buf) > 0) {
+                               lprintf(9, "Attendee: <%s>\n", buf);
+                               sprintf(attendee_string, "MAILTO:%s", buf);
+                               foundit = 0;
+
+                               for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+                                       if (!strcasecmp(attendee_string,
+                                          icalproperty_get_attendee(attendee)))
+                                               ++foundit;
+                               }
+
+
+                               if (foundit == 0) {
+                                       icalcomponent_add_property(vevent,
+                                               icalproperty_new_attendee(attendee_string)
+                                       );
+                               }
+                       }
+               }
+
+               /*
+                * Remove any attendees *not* listed in the web form
+                */
+STARTOVER:
+               for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+                       strcpy(attendee_string, icalproperty_get_attendee(attendee));
+                       if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+                               strcpy(attendee_string, &attendee_string[7]);
+                               striplt(attendee_string);
+                               foundit = 0;
+                               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
+                                       extract_token(buf, form_attendees, i, ',');
+                                       striplt(buf);
+                                       if (!strcasecmp(buf, attendee_string)) ++foundit;
+                               }
+                               if (foundit == 0) {
+                                       icalcomponent_remove_property(vevent, attendee);
+                                       icalproperty_free(attendee);
+                                       goto STARTOVER;
+                               }
+                       }
+               }
+
+               /*
+                * Serialize it and save it to the message base
+                */
                serv_puts("ENT0 1|||4");
                serv_gets(buf);
                if (buf[0] == '4') {
@@ -180,18 +624,13 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        serv_puts("");
                        serv_puts(icalcomponent_as_ical_string(vevent));
                        serv_puts("000");
-                       delete_existing = 1;
                }
        }
 
        /*
-        * If the user clicked 'Delete' then delete it, period.
+        * If the user clicked 'Delete' then delete it.
         */
-       if (!strcasecmp(bstr("sc"), "Delete")) {
-               delete_existing = 1;
-       }
-
-       if ( (delete_existing) && (msgnum > 0L) ) {
+       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
                serv_gets(buf);
        }
@@ -205,4 +644,4 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 }
 
 
-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */