/*
- * $Id$
- *
* Editing calendar events.
+ *
+ * Copyright (c) 2002-2012 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "webcit.h"
-#include "webserver.h"
+#include "calendar.h"
/*
* 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, char *from, int unread) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+ int unread, calview *calv)
+{
+ wcsession *WCC = WC;
icalcomponent *vevent;
icalproperty *p;
icalvalue *v;
char buf[SIZ];
int organizer_is_me = 0;
int i, j = 0;
+ /************************************************************
+ * Uncomment this to see the UID in calendar events for debugging
int sequence = 0;
-
- lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
+ */
+ char weekday_labels[7][32];
+ char month_labels[12][32];
+ long weekstart = 0;
+ icalproperty *rrule = NULL;
+ struct icalrecurrencetype recur;
+ char weekday_is_selected[7];
+ int which_rrmonthtype_is_preselected = 0;
+
+ int rrmday;
+ int rrmweekday;
+
+ icaltimetype day1;
+ int weekbase;
+ int rrmweek;
+ int rrymweek;
+ int rrymweekday;
+ int rrymonth;
+ int which_rrend_is_preselected;
+ int which_rryeartype_is_preselected;
+
+ const char *ch;
+ const char *tabnames[3];
+ const char *frequency_units[8];
+ const char *ordinals[6];
+
+ frequency_units[0] = _("seconds");
+ frequency_units[1] = _("minutes");
+ frequency_units[2] = _("hours");
+ frequency_units[3] = _("days");
+ frequency_units[4] = _("weeks");
+ frequency_units[5] = _("months");
+ frequency_units[6] = _("years");
+ frequency_units[7] = _("never");
+
+
+ ordinals[0] = "0";
+ ordinals[1] = _("first");
+ ordinals[2] = _("second");
+ ordinals[3] = _("third");
+ ordinals[4] = _("fourth");
+ ordinals[5] = _("fifth");
+
+
+ tabnames[0] = _("Event");
+ tabnames[1] = _("Attendees");
+ tabnames[2] = _("Recurrence");
+
+ get_pref_long("weekstart", &weekstart, 17);
+ if (weekstart > 6) weekstart = 0;
+
+ syslog(LOG_DEBUG, "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 */
+
+ /* populate the month names - begin */
+ now = 259200L; /* 1970-jan-04 is the first Sunday ever */
+ localtime_r(&now, &tm_now);
+ for (i=0; i<12; ++i) {
+ localtime_r(&now, &tm_now);
+ wc_strftime(month_labels[i], 32, "%B", &tm_now);
+ now += 2678400L;
+ }
+ /* populate the month names - end */
+
now = time(NULL);
strcpy(organizer_string, "");
strcpy(attendee_string, "");
if (supplied_vevent != NULL) {
vevent = supplied_vevent;
+
+ /* Convert all timestamps to UTC to make them easier to process. */
+ ical_dezonify(vevent);
+
/*
* If we're looking at a fully encapsulated VCALENDAR
* rather than a VEVENT component, attempt to use the first
display_edit_individual_event(
icalcomponent_get_first_component(
vevent, ICAL_VEVENT_COMPONENT),
- msgnum, from, unread
+ msgnum, from, unread, NULL
);
return;
}
/* Learn the sequence */
p = icalcomponent_get_first_property(vevent, ICAL_SEQUENCE_PROPERTY);
+ /************************************************************
+ * Uncomment this to see the UID in calendar events for debugging
if (p != NULL) {
sequence = icalproperty_get_sequence(p);
}
-
+ */
/* Begin output */
- 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");
+ output_headers(1, 1, 1, 0, 0, 0);
+ wc_printf("<div id=\"room_banner_override\">\n");
+ wc_printf("<h1>");
+ wc_printf(_("Add or edit an event"));
+ wc_printf("</h1>");
+ wc_printf("</div>\n");
- wprintf("<div class=\"fix_scrollbar_bug\">");
+ wc_printf("<div id=\"content\" class=\"service\">\n");
/************************************************************
* Uncomment this to see the UID in calendar events for debugging
- wprintf("UID == ");
+ wc_printf("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);
+ wc_printf("<br>\n");
+ wc_printf("SEQUENCE == %d<br>\n", sequence);
*************************************************************/
- wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+ wc_printf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
+ wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
+ wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+ StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+ wc_printf("\">\n");
+
+ wc_printf("<input type=\"hidden\" name=\"msgnum\" value=\"%ld\">\n",
msgnum);
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"calview\" value=\"%s\">\n",
bstr("calview"));
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"year\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"year\" value=\"%s\">\n",
bstr("year"));
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"month\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"month\" value=\"%s\">\n",
bstr("month"));
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
+ wc_printf("<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");
+ wc_printf("<table border='0' width='100%%'>\n");
- wprintf("<TR><TD><B>");
- wprintf(_("Summary"));
- wprintf("</B></TD><TD>\n"
- "<INPUT TYPE=\"text\" NAME=\"summary\" "
- "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Summary"));
+ wc_printf("</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("\"></TD></TR>\n");
+ wc_printf("\"></td></tr>\n");
- wprintf("<TR><TD><B>");
- wprintf(_("Location"));
- wprintf("</B></TD><TD>\n"
- "<INPUT TYPE=\"text\" NAME=\"location\" "
- "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Location"));
+ wc_printf("</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");
+ wc_printf("\"></td></tr>\n");
- wprintf("<TR><TD><B>");
- wprintf(_("Start"));
- wprintf("</B></TD><TD>\n");
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Start"));
+ wc_printf("</b></td><td>\n");
p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t_start = icalproperty_get_dtstart(p);
((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\" id=\"alldayevent\" NAME=\"alldayevent\" "
- "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
+ wc_printf("<input type=\"checkbox\" id=\"alldayevent\" name=\"alldayevent\" "
+ "value=\"yes\" onclick=\"eventEditAllDay();\""
" %s >%s",
- (t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
+ (t_start.is_date ? "checked=\"checked\"" : "" ),
_("All day event")
);
- wprintf("</TD></TR>\n");
+ wc_printf("</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 id=\"dtendcell\">\n");
- if (t_start.is_date) {
- t_end = t_start;
+ wc_printf("<tr><td><b>");
+ wc_printf(_("End"));
+ wc_printf("</b></td><td id=\"dtendcell\">\n");
+ p = icalcomponent_get_first_property(vevent,
+ ICAL_DTEND_PROPERTY);
+ if (p != NULL) {
+ t_end = icalproperty_get_dtend(p);
+
+ /*
+ * If this is an all-day-event, the end time is set to real end
+ * day + 1, so we have to adjust accordingly.
+ */
+ if (t_start.is_date) {
+ icaltime_adjust(&t_end, -1, 0, 0, 0);
+ }
}
else {
- p = icalcomponent_get_first_property(vevent,
- ICAL_DTEND_PROPERTY);
- if (p != NULL) {
- t_end = icalproperty_get_dtend(p);
+ if (created_new_vevent == 1) {
+ /* set default duration */
+ if (t_start.is_date) {
+ /*
+ * 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).
+ */
+ t_end = t_start;
+ }
+ 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); */
+ }
}
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.
+ * If an existing event has no end date/time this is
+ * supposed to mean end = start.
*/
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>");
- wprintf(_("Notes"));
- wprintf("</B></TD><TD>\n"
- "<TEXTAREA NAME=\"description\" wrap=soft "
- "ROWS=5 COLS=80 WIDTH=80>\n"
+ display_icaltimetype_as_webform(&t_end, "dtend", 0);
+ wc_printf("</td></tr>\n");
+
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Notes"));
+ wc_printf("</b></td><td>\n"
+ "<textarea name=\"description\" "
+ "rows='5' cols='72' style='width:72'>\n"
);
p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wprintf("</TEXTAREA></TD></TR>");
+ wc_printf("</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);
+ sprintf(organizer_string, "mailto:%s", ChrPtr(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)) {
+ if (!strncasecmp(organizer_string, "mailto:", 7)) {
strcpy(organizer_string, &organizer_string[7]);
- striplt(organizer_string);
+ string_trim(organizer_string);
serv_printf("ISME %s", organizer_string);
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
}
}
- wprintf("<TR><TD><B>");
- wprintf(_("Organizer"));
- wprintf("</B></TD><TD>");
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Organizer"));
+ wc_printf("</b></td><td>");
escputs(organizer_string);
if (organizer_is_me) {
- wprintf(" <FONT SIZE=-1><I>");
- wprintf(_("(you are the organizer)"));
- wprintf("</I></FONT>\n");
+ wc_printf(" <font size='-1'><i>");
+ wc_printf(_("(you are the organizer)"));
+ wc_printf("</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=\"");
+ wc_printf("<input type=\"hidden\" name=\"organizer\" value=\"");
escputs(organizer_string);
- wprintf("\">");
+ wc_printf("\">");
- wprintf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
- /** Transparency */
- wprintf("<TR><TD><B>");
- wprintf(_("Show time as:"));
- wprintf("</B></TD><TD>");
+ /* Transparency */
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Show time as:"));
+ wc_printf("</b></td><td>");
p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
if (p == NULL) {
- /** No transparency found. Default to opaque (busy). */
+ /* No transparency found. Default to opaque (busy). */
p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
if (p != NULL) {
icalcomponent_add_property(vevent, p);
v = NULL;
}
- wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
- if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
- wprintf(" CHECKED");
- wprintf(">");
- wprintf(_("Free"));
- wprintf(" ");
+ wc_printf("<input type=\"radio\" name=\"transp\" value=\"transparent\"");
+ if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)) {
+ wc_printf(" CHECKED");
+ }
+ wc_printf(">");
+ wc_printf(_("Free"));
+ wc_printf(" ");
- wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
- if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)
- wprintf(" CHECKED");
- wprintf(">");
- wprintf(_("Busy"));
+ wc_printf("<input type=\"radio\" name=\"transp\" value=\"opaque\"");
+ if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)) {
+ wc_printf(" CHECKED");
+ }
+ wc_printf(">");
+ wc_printf(_("Busy"));
- wprintf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
- /** Done with properties. */
- wprintf("</TABLE>\n");
+ /* Done with properties. */
+ wc_printf("</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(
+ wc_printf("<table border='0' width='100%%'>\n"); /* same table style as the event tab */
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Attendees"));
+ wc_printf("</b><br>"
+ "<font size='-2'>");
+ wc_printf(_("(One per line)"));
+ wc_printf("</font>\n");
+
+ /* Pop open an address book -- begin */
+ wc_printf(
" <a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
"title=\"%s\">"
- "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+ "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/webcit_icons/essen/16x16/contact.png\">"
"</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 ")
+ /* Pop open an address book -- end */
+
+ wc_printf("</td><td>"
+ "<textarea %s name=\"attendees\" id=\"attendees_box\" "
+ "onchange=\"EnableOrDisableCheckButton();\" "
+ "onKeyPress=\"EnableOrDisableCheckButton();\" "
+ "rows='10' cols='72' style='width:72'>\n",
+ (organizer_is_me ? "" : "disabled='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)) {
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strncasecmp(ch, "mailto:", 7)) {
- /** screen name or email address */
- strcpy(attendee_string, &attendee_string[7]);
- striplt(attendee_string);
- if (i++) wprintf("\n");
+ /* screen name or email address */
+ safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
+ string_trim(attendee_string);
+ if (i++) wc_printf("\n");
escputs(attendee_string);
- wprintf(" ");
+ wc_printf(" ");
- /** participant status */
+ /* participant status */
partstat_as_string(buf, attendee);
escputs(buf);
}
}
- wprintf("</TEXTAREA></TD></TR>\n");
- wprintf("</TABLE>\n");
+ wc_printf("</textarea></td></tr>\n");
+ wc_printf("</table>\n");
end_tab(1, 3);
/* 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=\"GreyOrUnGrayStuffFIXME();\"" */
+ wc_printf("<input type=\"checkbox\" id=\"is_recur\" name=\"is_recur\" "
+ "value=\"yes\" "
+ "onclick=\"RecurrenceShowHide();\""
" %s >%s",
- (rrule ? "CHECKED=\"CHECKED\"" : "" ),
- _("This is a repeating event")
+ (rrule ? "checked=\"checked\"" : "" ),
+ _("This is a recurring event")
);
- if (rrule) {
- recur = icalproperty_get_rrule(rrule);
+ wc_printf("<div id=\"rrule_div\">\n"); /* begin 'rrule_div' div */
- wprintf("<table border=0 width=100%%>\n"); /* same table style as the event tab */
-
- /* Table row displaying raw RRULE data, FIXME remove when finished */
- 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")
- };
-
- wprintf("<tr><td><b>");
- wprintf(_("Repeats"));
- wprintf("</b></td><td>");
- if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
- wprintf("every %d %s", recur.interval, frequency_units[recur.freq]); //FIXME
- wprintf("</td></tr>\n");
-
- wprintf("<tr><td><b>");
- wprintf("byday"); //FIXME
- wprintf("</b></td><td>");
- 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=1; j<=ICAL_SATURDAY_WEEKDAY; ++j) {
- if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j) {
- wprintf("day%d, ", j);
- }
+ wc_printf("<table border='0' cellspacing='10' width='100%%'>\n");
+
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Recurrence rule"));
+ wc_printf("</b></td><td>");
+
+ if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
+ wc_printf("%s ", _("Repeats every"));
+
+ wc_printf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
+ wc_printf("value=\"%d\"> ", recur.interval);
+
+ wc_printf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
+ wc_printf("<option %s%svalue=\"%d\">%s</option>\n",
+ ((i == recur.freq) ? "selected='selected' " : ""),
+ (((i == recur.freq) || ((i>=3)&&(i<=6))) ? "" : "disabled='disabled' "),
+ i,
+ frequency_units[i]
+ );
+ }
+ wc_printf("</select>\n");
+
+ wc_printf("<div id=\"weekday_selector\">"); /* begin 'weekday_selector' div */
+ wc_printf("%s<br>", _("on these weekdays:"));
+
+ 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;
}
}
}
- wprintf("</td></tr>\n");
+ }
+
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
+ wc_printf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+ if (weekday_is_selected[i]) wc_printf(" checked='checked'");
+ wc_printf(">%s\n", weekday_labels[i]);
+ }
+ wc_printf("</div>\n"); /* end 'weekday_selector' div */
+
+
+
+
+
+ wc_printf("<div id=\"monthday_selector\">"); /* begin 'monthday_selector' div */
+
+ wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+ "value=\"rrmonthtype_mday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrmonthtype_is_preselected == 0) ? "checked='checked'" : "")
+ );
+
+ rrmday = t_start.day;
+ rrmweekday = icaltime_day_of_week(t_start) - 1;
+
+ /* Figure out what week of the month we're in */
+ day1 = t_start;
+ day1.day = 1;
+ weekbase = icaltime_week_number(day1);
+ rrmweek = icaltime_week_number(t_start) - weekbase + 1;
+
+ /* Are we going by day of the month or week/day? */
+
+ if (recur.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+ which_rrmonthtype_is_preselected = 0;
+ rrmday = recur.by_month_day[0];
+ }
+ else if (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+ which_rrmonthtype_is_preselected = 1;
+ rrmweek = icalrecurrencetype_day_position(recur.by_day[0]);
+ rrmweekday = icalrecurrencetype_day_day_of_week(recur.by_day[0]) - 1;
+ }
+
+ wc_printf(_("on day %s%d%s of the month"), "<span id=\"rrmday\">", rrmday, "</span>");
+ wc_printf("<br>\n");
+
+ wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+ "value=\"rrmonthtype_wday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrmonthtype_is_preselected == 1) ? "checked='checked'" : "")
+ );
+
+ wc_printf(_("on the "));
+ wc_printf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=5; ++i) {
+ wc_printf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrmweek) ? "selected='selected' " : ""),
+ i,
+ ordinals[i]
+ );
+ }
+ wc_printf("</select> \n");
+
+ wc_printf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
+ wc_printf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrmweekday) ? "selected='selected' " : ""),
+ i,
+ weekday_labels[i]
+ );
+ }
+ wc_printf("</select>");
- wprintf("</table>\n");
+ wc_printf(" %s<br>\n", _("of the month"));
+
+ wc_printf("</div>\n"); /* end 'monthday_selector' div */
+
+
+ rrymweek = rrmweek;
+ rrymweekday = rrmweekday;
+ rrymonth = t_start.month;
+ which_rryeartype_is_preselected = 0;
+
+ if (
+ (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX)
+ && (recur.by_day[0] != 0)
+ && (recur.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX)
+ && (recur.by_month[0] != 0)
+ ) {
+ which_rryeartype_is_preselected = 1;
+ rrymweek = icalrecurrencetype_day_position(recur.by_day[0]);
+ rrymweekday = icalrecurrencetype_day_day_of_week(recur.by_day[0]) - 1;
+ rrymonth = recur.by_month[0];
+ }
+
+ wc_printf("<div id=\"yearday_selector\">"); /* begin 'yearday_selector' div */
+
+ wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ymday\" "
+ "value=\"rryeartype_ymday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rryeartype_is_preselected == 0) ? "checked='checked'" : "")
+ );
+ wc_printf(_("every "));
+ wc_printf("<span id=\"ymday\">%s</span><br>", _("year on this date"));
+
+ wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
+ "value=\"rryeartype_ywday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rryeartype_is_preselected == 1) ? "checked='checked'" : "")
+ );
+
+ wc_printf(_("on the "));
+ wc_printf("<select name=\"rrymweek\" id=\"rrymweek\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=5; ++i) {
+ wc_printf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymweek) ? "selected='selected' " : ""),
+ i,
+ ordinals[i]
+ );
}
+ wc_printf("</select> \n");
+
+ wc_printf("<select name=\"rrymweekday\" id=\"rrymweekday\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
+ wc_printf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymweekday) ? "selected='selected' " : ""),
+ i,
+ weekday_labels[i]
+ );
+ }
+ wc_printf("</select>");
+
+ wc_printf(" %s ", _("of"));
+
+ wc_printf("<select name=\"rrymonth\" id=\"rrymonth\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=12; ++i) {
+ wc_printf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymonth) ? "selected='selected' " : ""),
+ i,
+ month_labels[i-1]
+ );
+ }
+ wc_printf("</select>");
+ wc_printf("<br>\n");
+
+ wc_printf("</div>\n"); /* end 'yearday_selector' div */
+
+ wc_printf("</td></tr>\n");
+
+
+ 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;
+
+ wc_printf("<tr><td><b>");
+ wc_printf(_("Recurrence range"));
+ wc_printf("</b></td><td>\n");
+
+ wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
+ "value=\"rrend_none\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrend_is_preselected == 0) ? "checked='checked'" : "")
+ );
+ wc_printf("%s<br>\n", _("No ending date"));
+
+ wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
+ "value=\"rrend_count\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrend_is_preselected == 1) ? "checked='checked'" : "")
+ );
+ wc_printf(_("Repeat this event"));
+ wc_printf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+ wc_printf("value=\"%d\"> ", recur.count);
+ wc_printf(_("times"));
+ wc_printf("<br>\n");
+
+ wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
+ "value=\"rrend_until\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrend_is_preselected == 2) ? "checked='checked'" : "")
+ );
+ wc_printf(_("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);
+ wc_printf("<br>\n");
+
+ wc_printf("</td></tr>\n");
+
+ wc_printf("</table>\n");
+ wc_printf("</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\">"
+ wc_printf("<center>"
+ "<input type=\"submit\" name=\"save_button\" value=\"%s\">"
" "
- "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
+ "<input type=\"submit\" name=\"delete_button\" value=\"%s\">\n"
" "
- "<INPUT TYPE=\"submit\" NAME=\"check_button\" "
- "VALUE=\"%s\">\n"
+ "<input type=\"submit\" id=\"check_button\" name=\"check_button\" value=\"%s\">\n"
" "
- "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
- "</CENTER>\n",
+ "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n"
+ "</center>\n",
_("Save"),
_("Delete"),
_("Check attendee availability"),
_("Cancel")
);
- wprintf("</FORM>\n");
end_tab(3, 3);
+ wc_printf("</form>\n");
- wprintf("</div>\n");
-
- wprintf("<script type=\"text/javascript\">"
- "eventEditAllDay();"
- "</script>\n"
+ StrBufAppendPrintf(WC->trailing_javascript,
+ "eventEditAllDay(); \n"
+ "RecurrenceShowHide(); \n"
+ "EnableOrDisableCheckButton(); \n"
);
- address_book_popup();
+ do_template("addressbook_popup");
+
wDumpContent(1);
if (created_new_vevent) {
* supplied_vevent: the event to save
* msgnum: the index on the citserver
*/
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+ int unread, calview *calv) {
+ StrBuf *Buf;
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
char organizer_string[SIZ];
int sequence = 0;
enum icalproperty_transp formtransp = ICAL_TRANSP_NONE;
+ const char *ch;
if (supplied_vevent != NULL) {
vevent = supplied_vevent;
- /**
+
+ /* Convert all timestamps to UTC to make them easier to process. */
+ ical_dezonify(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
if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
save_individual_event(
icalcomponent_get_first_component(
- vevent, ICAL_VEVENT_COMPONENT),
- msgnum, from, unread
+ vevent, ICAL_VEVENT_COMPONENT),
+ msgnum, from, unread, NULL
);
return;
}
if ( (havebstr("save_button"))
|| (havebstr("check_button")) ) {
- /** Replace values in the component with ones from the form */
+ /* Replace values in the component with ones from the form */
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SUMMARY_PROPERTY), prop != NULL) {
icalproperty_free(prop);
}
+ /* Add NOW() to the calendar object... */
+ icalcomponent_set_dtstamp(vevent,
+ icaltime_from_timet_with_zone(
+ time(NULL), 0, icaltimezone_get_utc_timezone()));
+
if (havebstr("summary")) {
-
icalcomponent_add_property(vevent,
icalproperty_new_summary(bstr("summary")));
} else {
icalcomponent_add_property(vevent,
- icalproperty_new_summary("Untitled Event"));
+ icalproperty_new_summary(_("Untitled Event")));
}
-
+
while (prop = icalcomponent_get_first_property(vevent,
ICAL_LOCATION_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
icaltime_from_webform(&event_start, "dtstart");
}
- /**
- * 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) {
+ /* Force it to serialize as a date-only rather than date/time */
icalproperty_set_value(prop, icalvalue_new_date(event_start));
}
icalproperty_free(prop);
}
- if (all_day_event == 0) {
- icaltime_from_webform(&t, "dtend");
- icalcomponent_add_property(vevent,
- icalproperty_new_dtend(icaltime_normalize(t)
- )
- );
+ if (all_day_event) {
+ icaltime_from_webform_dateonly(&t, "dtend");
+
+ /* with this field supposed to be non-inclusive we have to add one day */
+ icaltime_adjust(&t, 1, 0, 0, 0);
}
+ else {
+ icaltime_from_webform(&t, "dtend");
+ }
+
+ icalcomponent_add_property(vevent,
+ icalproperty_new_dtend(icaltime_normalize(t)
+ )
+ );
+
+ /* recurrence rules -- begin */
+
+ /* remove any existing rule */
+ while (prop = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY), prop != NULL) {
+ icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
+ }
+
+ if (yesbstr("is_recur")) {
+ struct icalrecurrencetype recur;
+ icalrecurrencetype_clear(&recur);
+
+ recur.interval = atoi(bstr("interval"));
+ recur.freq = atoi(bstr("freq"));
+
+ switch(recur.freq) {
+
+ /* These can't happen; they're disabled. */
+ case ICAL_SECONDLY_RECURRENCE:
+ break;
+ case ICAL_MINUTELY_RECURRENCE:
+ break;
+ case ICAL_HOURLY_RECURRENCE:
+ break;
+
+ /* Daily is valid but there are no further inputs. */
+ case ICAL_DAILY_RECURRENCE:
+ break;
+
+ /* These are the real options. */
+
+ case ICAL_WEEKLY_RECURRENCE:
+ j=0;
+ for (i=0; i<7; ++i) {
+ snprintf(buf, sizeof buf, "weekday%d", i);
+ if (YESBSTR(buf)) recur.by_day[j++] =
+ icalrecurrencetype_day_day_of_week(i+1);
+ }
+ recur.by_day[j++] = ICAL_RECURRENCE_ARRAY_MAX;
+ break;
+
+ case ICAL_MONTHLY_RECURRENCE:
+ if (!strcasecmp(bstr("rrmonthtype"), "rrmonthtype_mday")) {
+ recur.by_month_day[0] = event_start.day;
+ recur.by_month_day[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ }
+ else if (!strcasecmp(bstr("rrmonthtype"), "rrmonthtype_wday")) {
+ recur.by_day[0] = (atoi(bstr("rrmweek")) * 8)
+ + atoi(bstr("rrmweekday")) + 1;
+ recur.by_day[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ }
+ break;
+
+ case ICAL_YEARLY_RECURRENCE:
+ if (!strcasecmp(bstr("rryeartype"), "rryeartype_ymday")) {
+ /* no further action is needed here */
+ }
+ else if (!strcasecmp(bstr("rryeartype"), "rryeartype_ywday")) {
+ recur.by_month[0] = atoi(bstr("rrymonth"));
+ recur.by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ recur.by_day[0] = (atoi(bstr("rrymweek")) * 8)
+ + atoi(bstr("rrymweekday")) + 1;
+ recur.by_day[1] = ICAL_RECURRENCE_ARRAY_MAX;
+ }
+ break;
+
+ /* This one can't happen either. */
+ case ICAL_NO_RECURRENCE:
+ break;
+ }
+
+ if (!strcasecmp(bstr("rrend"), "rrend_count")) {
+ recur.count = atoi(bstr("rrcount"));
+ }
+ else if (!strcasecmp(bstr("rrend"), "rrend_until")) {
+ icaltime_from_webform_dateonly(&recur.until, "rruntil");
+ }
- /** See if transparency is indicated */
+ icalcomponent_add_property(vevent, icalproperty_new_rrule(recur));
+ }
+
+ /* recurrence rules -- end */
+
+ /* See if transparency is indicated */
if (havebstr("transp")) {
if (!strcasecmp(bstr("transp"), "opaque")) {
formtransp = ICAL_TRANSP_OPAQUE;
icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
}
- /** Give this event a UID if it doesn't have one. */
+ /* Give this event a UID if it doesn't have one. */
if (icalcomponent_get_first_property(vevent,
ICAL_UID_PROPERTY) == NULL) {
generate_uuid(buf);
icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
}
- /** Increment the sequence ID */
+ /* Increment the sequence ID */
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
i = icalproperty_get_sequence(prop);
icalcomponent_add_property(vevent,
icalproperty_new_sequence(sequence)
);
-
- /**
+
+ /*
* 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)
+ ICAL_ORGANIZER_PROPERTY) == NULL)
&& (!IsEmptyStr(buf)) ) {
- /** set new organizer */
+ /* 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, '(', ')');
+ while ( stripout(form_attendees, '(', ')') != 0);
/* Next, change any commas to newlines, because we want newline-separated attendees. */
j = strlen(form_attendees);
}
}
- /** Now iterate! */
+ /* Now iterate! */
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
- striplt(buf);
+ string_trim(buf);
if (!IsEmptyStr(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)))
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strcasecmp(attendee_string, ch))
++foundit;
}
if (foundit == 0) {
icalcomponent_add_property(vevent,
- icalproperty_new_attendee(attendee_string)
+ 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);
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
+ safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
+ string_trim(attendee_string);
foundit = 0;
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
- striplt(buf);
+ string_trim(buf);
if (!strcasecmp(buf, attendee_string)) ++foundit;
}
if (foundit == 0) {
}
}
- /**
+ /*
* 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
/* Set the method to PUBLISH */
icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
- /** If the user clicked 'Save' then save it to the server. */
+ /* 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') {
+ switch (buf[0]) {
+ case '8':
serv_puts("Content-type: text/calendar");
+ serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
- serv_puts(icalcomponent_as_ical_string(encaps));
+ Buf = NewStrBufPlain(icalcomponent_as_ical_string(encaps), -1);
+ text_to_server_qp(Buf);
+ FreeStrBuf(&Buf);
+// 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]);
+ case '4':
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {}
+ break;
+ case '2':
+ AppendImportantMessage(buf + 4, - 1);
+ break;
+ default:
+ break;
}
icalmemory_free_ring ();
icalcomponent_free(encaps);
+ encaps = NULL;
}
- /** Or, check attendee availability if the user asked for that. */
+ /* 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);
+ /* 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;
}
}
icalcomponent_free(vevent);
}
- /* If this was a save or delete, go back to the calendar view. */
+ /* If this was a save or delete, go back to the calendar or summary view. */
if (!havebstr("check_button")) {
- readloop("readfwd");
+ if (!strcasecmp(bstr("calview"), "summary")) {
+ display_summary_page();
+ }
+ else {
+ readloop(readfwd, eUseDefault);
+ }
}
}
projects / citadel.git / blobdiff