* 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, struct calview *calv)
+{
icalcomponent *vevent;
icalproperty *p;
icalvalue *v;
int i, j = 0;
int sequence = 0;
char weekday_labels[7][32];
+ char month_labels[12][32];
+ long weekstart = 0;
+ icalproperty *rrule = NULL;
+ struct icalrecurrencetype recur;
+
+ char *tabnames[3];
+ tabnames[0] = _("Event");
+ tabnames[1] = _("Attendees");
+ tabnames[2] = _("Recurrence");
+
+ 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 - 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;
}
wprintf("SEQUENCE == %d<br />\n", sequence);
*************************************************************/
- wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
+ wprintf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
bstr("day"));
- char *tabnames[] = {
- _("Event"),
- _("Attendees"),
- _("Recurrence")
- };
tabbed_dialog(3, tabnames);
begin_tab(0, 3);
wprintf(_("Notes"));
wprintf("</B></TD><TD>\n"
"<TEXTAREA NAME=\"description\" wrap=soft "
- "ROWS=5 COLS=80 WIDTH=80>\n"
+ "ROWS=5 COLS=72 WIDTH=72>\n"
);
p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
}
wprintf("</TEXTAREA></TD></TR>");
- /**
+ /*
* For a new event, the user creating the event should be the
* organizer. Set this field accordingly.
*/
);
}
- /**
+ /*
* Determine who is the organizer of this event.
* We need to determine "me" or "not me."
*/
wprintf("</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
wprintf("</TD></TR>\n");
- /** Transparency */
+ /* Transparency */
wprintf("<TR><TD><B>");
wprintf(_("Show time as:"));
wprintf("</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);
}
wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
- if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
+ if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)) {
wprintf(" CHECKED");
+ }
wprintf(">");
wprintf(_("Free"));
wprintf(" ");
wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
- if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)
+ if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)) {
wprintf(" CHECKED");
+ }
wprintf(">");
wprintf(_("Busy"));
wprintf("</TD></TR>\n");
- /** Done with properties. */
+ /* Done with properties. */
wprintf("</TABLE>\n");
end_tab(0, 3);
wprintf(_("(One per line)"));
wprintf("</font>\n");
- /** Pop open an address book -- begin **/
+ /* Pop open an address book -- begin */
wprintf(
" <a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
"title=\"%s\">"
_("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 "
- "ROWS=3 COLS=80 WIDTH=80>\n",
+ "onchange=\"EnableOrDisableCheckButton();\" "
+ "onKeyPress=\"EnableOrDisableCheckButton();\" "
+ "ROWS=10 COLS=72 WIDTH=72>\n",
(organizer_is_me ? "" : "DISABLED ")
);
i = 0;
strcpy(attendee_string, icalproperty_get_attendee(attendee));
if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
- /** screen name or email address */
+ /* screen name or email address */
strcpy(attendee_string, &attendee_string[7]);
striplt(attendee_string);
if (i++) wprintf("\n");
escputs(attendee_string);
wprintf(" ");
- /** participant status */
+ /* participant status */
partstat_as_string(buf, attendee);
escputs(buf);
}
/* Recurrence tab */
begin_tab(2, 3);
- icalproperty *rrule = NULL;
- struct icalrecurrencetype recur;
rrule = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY);
if (rrule) {
/* 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;
}
"onclick=\"RecurrenceShowHide();\""
" %s >%s",
(rrule ? "CHECKED=\"CHECKED\"" : "" ),
- _("This is a repeating event")
+ _("This is a recurring event")
);
- wprintf("<div id=\"rrule\">\n"); /* begin 'rrule' div */
+ wprintf("<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 */
- 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");
- }
+ wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
char *frequency_units[] = {
_("seconds"),
_("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\"> ", recur.interval);
+ wprintf("value=\"%d\"> ", 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 == recur.freq) || ((i>=3)&&(i<=6))) ? "" : "disabled "),
i,
frequency_units[i]
);
}
}
- for (i=0; i<7; ++i) {
+ 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</input>\n", weekday_labels[i]);
+ wprintf(">%s\n", weekday_labels[i]);
}
wprintf("</div>\n"); /* end 'weekday_selector' div */
- wprintf("</td></tr>\n");
- // FIXME preselect the correct radio button
+
+ int which_rrmonthtype_is_preselected = 0;
+ wprintf("<div id=\"monthday_selector\">"); /* begin 'monthday_selector' div */
+
+ wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+ "value=\"rrmonthtype_mday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
+ );
+
+ int rrmday = t_start.day;
+ int rrmweekday = icaltime_day_of_week(t_start) - 1;
+
+ /* Figure out what week of the month we're in */
+ icaltimetype day1 = t_start;
+ day1.day = 1;
+ int weekbase = icaltime_week_number(day1);
+ int 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;
+ }
+
+ wprintf(_("on day %s%d%s of the month"), "<span id=\"rrmday\">", rrmday, "</span>");
+ wprintf("<br />\n");
+
+ wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+ "value=\"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",
+ ((i==rrmweek) ? "selected " : ""),
+ 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",
+ ((i==rrmweekday) ? "selected " : ""),
+ i,
+ weekday_labels[i]
+ );
+ }
+ wprintf("</select>");
+
+ wprintf(" %s<br />\n", _("of the month"));
+
+ wprintf("</div>\n"); /* end 'monthday_selector' div */
+
+
+ int rrymweek = rrmweek;
+ int rrymweekday = rrmweekday;
+ int rrymonth = t_start.month;
+ int 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];
+ }
+
+ wprintf("<div id=\"yearday_selector\">"); /* begin 'yearday_selector' div */
+
+ wprintf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ymday\" "
+ "value=\"rryeartype_ymday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rryeartype_is_preselected == 0) ? "checked" : "")
+ );
+ wprintf(_("every "));
+ wprintf("<span id=\"ymday\">%s</span><br />", _("year on this date"));
+
+ wprintf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
+ "value=\"rryeartype_ywday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rryeartype_is_preselected == 1) ? "checked" : "")
+ );
+
+ wprintf(_("on the "));
+ wprintf("<select name=\"rrymweek\" id=\"rrymweek\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=5; ++i) {
+ wprintf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymweek) ? "selected " : ""),
+ i,
+ ordinals[i]
+ );
+ }
+ wprintf("</select> \n");
+
+ wprintf("<select name=\"rrymweekday\" id=\"rrymweekday\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
+ wprintf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymweekday) ? "selected " : ""),
+ i,
+ weekday_labels[i]
+ );
+ }
+ wprintf("</select>");
+
+ wprintf(" %s ", _("of"));
+
+ wprintf("<select name=\"rrymonth\" id=\"rrymonth\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=12; ++i) {
+ wprintf("<option %svalue=\"%d\">%s</option>\n",
+ ((i==rrymonth) ? "selected " : ""),
+ i,
+ month_labels[i-1]
+ );
+ }
+ wprintf("</select>");
+ wprintf("<br />\n");
+
+ wprintf("</div>\n"); /* end 'yearday_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\" "
+ "value=\"rrend_none\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (1 ? "checked" : "")
+ ((which_rrend_is_preselected == 0) ? "checked" : "")
);
- wprintf("%s</input><br />\n", _("No ending date"));
+ wprintf("%s<br />\n", _("No ending date"));
wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
+ "value=\"rrend_count\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (0 ? "checked" : "")
+ ((which_rrend_is_preselected == 1) ? "checked" : "")
);
wprintf(_("Repeat this event"));
- wprintf("</input> ");
- wprintf("<input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+ 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\" "
+ "value=\"rrend_until\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (0 ? "checked" : "")
+ ((which_rrend_is_preselected == 2) ? "checked" : "")
);
wprintf(_("Repeat this event until "));
- wprintf("</input>");
+
+ 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 */
" "
"<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",
wprintf("</FORM>\n");
end_tab(3, 3);
- wprintf("</div>\n");
+ wprintf("</div>\n"); /* end 'fix_scrollbar_bug' div */
- wprintf("<script type=\"text/javascript\"> \n"
- "eventEditAllDay(); \n"
- "RecurrenceShowHide(); \n"
- "</script> \n"
+ StrBufAppendPrintf(WC->trailing_javascript,
+ "eventEditAllDay(); \n"
+ "RecurrenceShowHide(); \n"
+ "EnableOrDisableCheckButton(); \n"
);
address_book_popup();
wDumpContent(1);
* 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, struct calview *calv) {
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
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
save_individual_event(
icalcomponent_get_first_component(
vevent, ICAL_VEVENT_COMPONENT),
- msgnum, from, unread
+ 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) {
}
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,
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));
}
);
}
- /** See if transparency is indicated */
+ /* 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");
+ }
+
+ 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);
icalproperty_new_sequence(sequence)
);
- /**
+ /*
* Set the organizer, only if one does not already exist *and*
* the form is supplying one
*/
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);
}
}
- /**
+ /*
* 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)) {
}
}
- /**
+ /*
* 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);
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;
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")) {
+ summary();
+ }
+ else {
+ readloop(readfwd);
+ }
}
}