#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;
+ 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 i;
+ 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;
+ /* 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
+ );
+ return;
+ }
}
else {
vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
created_new_vevent = 1;
}
- output_headers(3);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
- "<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
- "<FONT SIZE=+1 COLOR=\"FFFFFF\""
- "<B>Edit event</B>"
- "</FONT></TD></TR></TABLE><BR>\n"
- );
+ /* Learn the sequence */
+ p = icalcomponent_get_first_property(vevent, ICAL_SEQUENCE_PROPERTY);
+ if (p != NULL) {
+ sequence = icalproperty_get_sequence(p);
+ }
+
+ /* Begin output */
+ output_headers(1, 1, 0, 0, 0, 0, 0);
+ do_template("beginbox_nt");
+ wprintf("<h3> <IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
+ " Add or edit an event</h3>\n");
/************************************************************
* Uncomment this to see the UID in calendar events for debugging
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");
}
}
else {
- memset(&t_start, 0, sizeof t_start);
- t_start.year = atoi(bstr("year"));
- t_start.month = atoi(bstr("month"));
- t_start.day = atoi(bstr("day"));
+ localtime_r(&now, &tm_now);
+ 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) {
- t_start.hour = atoi(bstr("hour"));
- t_start.minute = atoi(bstr("minute"));
+ tm_now.tm_hour = atoi(bstr("hour"));
+ tm_now.tm_min = atoi(bstr("minute"));
+ tm_now.tm_sec = 0;
}
else {
- t_start.hour = 9;
- t_start.minute = 0;
+ tm_now.tm_hour = 9;
+ tm_now.tm_min = 0;
+ tm_now.tm_sec = 0;
}
- /* t_start = icaltime_from_timet(now, 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_start, "dtstart");
wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
- "VALUE=\"yes\" onClick=\"
-
- if (this.checked) {
- this.form.dtstart_hour.value='0';
- this.form.dtstart_hour.disabled = true;
- this.form.dtstart_minute.value='0';
- this.form.dtstart_minute.disabled = true;
- this.form.dtend_hour.value='0';
- this.form.dtend_hour.disabled = true;
- this.form.dtend_minute.value='0';
- this.form.dtend_minute.disabled = true;
- this.form.dtend_month.disabled = true;
- this.form.dtend_day.disabled = true;
- this.form.dtend_year.disabled = true;
- }
- else {
- this.form.dtstart_hour.disabled = false;
- this.form.dtstart_minute.disabled = false;
- this.form.dtend_hour.disabled = false;
- this.form.dtend_minute.disabled = false;
- this.form.dtend_month.disabled = false;
- this.form.dtend_day.disabled = false;
- this.form.dtend_year.disabled = false;
- }
-
-
- \" %s >All day event",
+ "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" : "" )
);
*/
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); */
}
wprintf("<TR><TD><B>Notes</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) {
}
wprintf("</TEXTAREA></TD></TR>");
- /* Determine who is the organizer of this event. This is useless
- * for now, but we'll need to determine "me" or "not me" soon.
+ /* 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 (!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>Organizer<BR>(FIXME)</TD><TD>");
+
+ wprintf("<TR><TD><B>Organizer</B></TD><TD>");
escputs(organizer_string);
if (organizer_is_me) {
- wprintf("(you. FIXME)\n");
+ 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 ");
+
+ 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 (do more with this later) */
- wprintf("<TR><TD><B>Attendes</B><BR>"
- "<FONT SIZE=-2>(Separate multiple attendees with commas)"
+ /* Attendees */
+ wprintf("<TR><TD><B>Attendees</B><br />"
+ "<FONT SIZE=-2>(One per line)"
"</FONT></TD><TD>"
- "<TEXTAREA NAME=\"attendees\" wrap=soft "
- "ROWS=3 COLS=80 WIDTH=80>\n");
+ "<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)) {
+ 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(" ");
+
+ /* participant status */
+ partstat_as_string(buf, attendee);
+ escputs(buf);
}
}
wprintf("</TEXTAREA></TD></TR>\n");
" "
"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
" "
+ "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+ "VALUE=\"Check attendee availability\">\n"
+ " "
"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n"
"</CENTER>\n"
);
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>
- ");
+ wprintf("<script language=\"javascript\">"
+ "<!--"
+ "if (document.EventForm.alldayevent.checked) {"
+ "document.EventForm.dtstart_hour.value='0';"
+ "document.EventForm.dtstart_hour.disabled = true;"
+ "document.EventForm.dtstart_minute.value='0';"
+ "document.EventForm.dtstart_minute.disabled = true;"
+ "document.EventForm.dtend_hour.value='0';"
+ "document.EventForm.dtend_hour.disabled = true;"
+ "document.EventForm.dtend_minute.value='0';"
+ "document.EventForm.dtend_minute.disabled = true;"
+ "document.EventForm.dtend_month.disabled = true;"
+ "document.EventForm.dtend_day.disabled = true;"
+ "document.EventForm.dtend_year.disabled = true;"
+ "}"
+ "else {"
+ "document.EventForm.dtstart_hour.disabled = false;"
+ "document.EventForm.dtstart_minute.disabled = false;"
+ "document.EventForm.dtend_hour.disabled = false;"
+ "document.EventForm.dtend_minute.disabled = false;"
+ "document.EventForm.dtend_month.disabled = false;"
+ "document.EventForm.dtend_day.disabled = false;"
+ "document.EventForm.dtend_year.disabled = false;"
+ "}"
+ "//-->"
+ "</script>\n"
+ );
+ do_template("endbox");
wDumpContent(1);
if (created_new_vevent) {
/*
* Save an edited event
+ *
*/
void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
char buf[SIZ];
- int delete_existing = 0;
icalproperty *prop;
- icalcomponent *vevent;
+ icalcomponent *vevent, *encaps;
int created_new_vevent = 0;
int all_day_event = 0;
struct icaltimetype event_start;
+ 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;
+ /* 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
+ );
+ return;
+ }
}
else {
vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
created_new_vevent = 1;
}
- if (!strcasecmp(bstr("sc"), "Save")) {
+ if ( (!strcasecmp(bstr("sc"), "Save"))
+ || (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
/* Replace values in the component with ones from the form */
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SUMMARY_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
}
icalcomponent_add_property(vevent,
icalproperty_new_summary(bstr("summary")));
-
+
while (prop = icalcomponent_get_first_property(vevent,
ICAL_LOCATION_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
+ 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")));
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;
- lprintf(9, "*** all day event ***\n");
}
else {
all_day_event = 0;
if (prop) icalcomponent_add_property(vevent, prop);
else icalproperty_free(prop);
-
-
while (prop = icalcomponent_get_first_property(vevent,
ICAL_DTEND_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
}
while (prop = icalcomponent_get_first_property(vevent,
ICAL_DURATION_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
}
if (all_day_event == 0) {
);
}
+ /* See if transparency is indicated */
+ if (strlen(bstr("transp")) > 0) {
+ if (!strcasecmp(bstr("transp"), "opaque")) {
+ formtransp = ICAL_TRANSP_OPAQUE;
+ }
+ else if (!strcasecmp(bstr("transp"), "transparent")) {
+ formtransp = ICAL_TRANSP_TRANSPARENT;
+ }
+
+ while (prop = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY),
+ (prop != NULL)) {
+ icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
+ }
+
+ lprintf(9, "adding new property...\n");
+ icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
+ lprintf(9, "...added it.\n");
+ }
+
/* Give this event a UID if it doesn't have one. */
+ lprintf(9, "Give this event a UID if it doesn't have one.\n");
if (icalcomponent_get_first_property(vevent,
ICAL_UID_PROPERTY) == NULL) {
- generate_new_uid(buf);
+ generate_uuid(buf);
icalcomponent_add_property(vevent,
icalproperty_new_uid(buf)
);
}
- /* Serialize it and save it to the message base */
- serv_puts("ENT0 1|||4");
- serv_gets(buf);
- if (buf[0] == '4') {
- serv_puts("Content-type: text/calendar");
- serv_puts("");
- serv_puts(icalcomponent_as_ical_string(vevent));
- serv_puts("000");
- delete_existing = 1;
+ /* Increment the sequence ID */
+ lprintf(9, "Increment the sequence ID\n");
+ while (prop = icalcomponent_get_first_property(vevent,
+ ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+ i = icalproperty_get_sequence(prop);
+ lprintf(9, "Sequence was %d\n", i);
+ if (i > sequence) sequence = i;
+ icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
}
+ ++sequence;
+ lprintf(9, "New sequence is %d. Adding...\n", sequence);
+ icalcomponent_add_property(vevent,
+ icalproperty_new_sequence(sequence)
+ );
+
+ /* Set the organizer, only if one does not already exist *and*
+ * the form is supplying one
+ */
+ lprintf(9, "Setting the organizer...\n");
+ 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
+ */
+ lprintf(9, "Add any new attendees\n");
+
+ /* First, strip out the parenthesized partstats. */
+ strcpy(form_attendees, bstr("attendees"));
+ stripout(form_attendees, '(', ')');
+
+ /* Now iterate! */
+ for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+ extract_token(buf, form_attendees, i, '\n');
+ 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: lprintf(9, "Remove unlisted attendees\n");
+ for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+ strcpy(attendee_string, icalproperty_get_attendee(attendee));
+ if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+ strcpy(attendee_string, &attendee_string[7]);
+ striplt(attendee_string);
+ foundit = 0;
+ for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+ extract_token(buf, form_attendees, i, '\n');
+ striplt(buf);
+ if (!strcasecmp(buf, attendee_string)) ++foundit;
+ }
+ if (foundit == 0) {
+ icalcomponent_remove_property(vevent, attendee);
+ icalproperty_free(attendee);
+ goto STARTOVER;
+ }
+ }
+ }
+
+ /*
+ * Encapsulate event into full VCALENDAR component. Clone it first,
+ * for two reasons: one, it's easier to just free the whole thing
+ * when we're done instead of unbundling, but more importantly, we
+ * can't encapsulate something that may already be encapsulated
+ * somewhere else.
+ */
+ lprintf(9, "Encapsulating into full VCALENDAR component\n");
+ encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
+
+ /* If the user clicked 'Save' then save it to the server. */
+ lprintf(9, "Serializing it for saving\n");
+ if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Save")) ) {
+ serv_puts("ENT0 1|||4");
+ serv_gets(buf);
+ if (buf[0] == '4') {
+ serv_puts("Content-type: text/calendar");
+ serv_puts("");
+ serv_puts(icalcomponent_as_ical_string(encaps));
+ serv_puts("000");
+ }
+ icalcomponent_free(encaps);
+ }
+
+ /* Or, check attendee availability if the user asked for that. */
+ if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+
+ /* 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);
+
+ icalcomponent_free(encaps);
+ }
+
}
/*
- * 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) ) {
+ lprintf(9, "Checking to see if we have to delete an old event\n");
+ if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
serv_printf("DELE %ld", atol(bstr("msgnum")));
serv_gets(buf);
}
icalcomponent_free(vevent);
}
- /* Go back to the event list */
- readloop("readfwd");
+ /* If this was a save or deelete, go back to the calendar view. */
+ if (strcasecmp(bstr("sc"), "Check attendee availability")) {
+ readloop("readfwd");
+ }
}
-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
projects / citadel.git / blobdiff