"
- "
\n"
- ""
+ /* submit buttons (common area beneath the tabs) */
+ begin_tab(3, 3);
+ wc_printf(""
+ ""
" "
- "\n"
+ "\n"
" "
- "\n"
+ "\n"
" "
- "\n"
- " \n",
+ "\n"
+ " \n",
_("Save"),
_("Delete"),
_("Check attendee availability"),
_("Cancel")
);
+ end_tab(3, 3);
+ wc_printf("\n");
- wprintf("\n");
-
- wprintf("
\n");
- wprintf("\n"
+ StrBufAppendPrintf(WC->trailing_javascript,
+ "eventEditAllDay(); \n"
+ "RecurrenceShowHide(); \n"
+ "EnableOrDisableCheckButton(); \n"
);
-
address_book_popup();
wDumpContent(1);
@@ -419,12 +783,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
}
}
-/**
- * \brief Save an edited event
- * \param supplied_vevent the event to save
- * \param msgnum the index on the citserver
+/*
+ * Save an edited event
+ *
+ * supplied_vevent: the event to save
+ * msgnum: the index on the citserver
*/
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+ int unread, calview *calv) {
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
@@ -442,7 +808,11 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
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
@@ -453,8 +823,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
save_individual_event(
icalcomponent_get_first_component(
- vevent, ICAL_VEVENT_COMPONENT
- ), msgnum
+ vevent, ICAL_VEVENT_COMPONENT),
+ msgnum, from, unread, NULL
);
return;
}
@@ -464,10 +834,10 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
created_new_vevent = 1;
}
- if ( (strlen(bstr("save_button")) > 0)
- || (strlen(bstr("check_button")) > 0) ) {
+ 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) {
@@ -475,21 +845,25 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
icalproperty_free(prop);
}
- if (strlen(bstr("summary")) > 0) {
-
+ /* Add NOW() to the calendar object... */
+ icalcomponent_set_dtstamp(vevent,
+ icaltime_from_timet(
+ time(NULL), 0));
+
+ 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);
icalproperty_free(prop);
}
- if (strlen(bstr("location")) > 0) {
+ if (havebstr("location")) {
icalcomponent_add_property(vevent,
icalproperty_new_location(bstr("location")));
}
@@ -498,7 +872,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
icalcomponent_remove_property(vevent, prop);
icalproperty_free(prop);
}
- if (strlen(bstr("description")) > 0) {
+ if (havebstr("description")) {
icalcomponent_add_property(vevent,
icalproperty_new_description(bstr("description")));
}
@@ -509,7 +883,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
icalproperty_free(prop);
}
- if (!strcmp(bstr("alldayevent"), "yes")) {
+ if (yesbstr("alldayevent")) {
all_day_event = 1;
}
else {
@@ -523,19 +897,11 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
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) {
- icalproperty_set_value(prop,
- icalvalue_new_date(event_start)
- );
+ /* Force it to serialize as a date-only rather than date/time */
+ icalproperty_set_value(prop, icalvalue_new_date(event_start));
}
if (prop) icalcomponent_add_property(vevent, prop);
@@ -552,16 +918,106 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
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");
}
- /** See if transparency is indicated */
- if (strlen(bstr("transp")) > 0) {
+ 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");
+ }
+
+ 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;
}
@@ -575,48 +1031,39 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
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");
+ /* 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)
- );
+ icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
}
- /** Increment the sequence ID */
- lprintf(9, "Increment the sequence ID\n");
+ /* Increment the sequence ID */
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) ) {
+ 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)
@@ -624,14 +1071,13 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
}
- /**
+ /*
* 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, '(', ')');
+ while ( stripout(form_attendees, '(', ')') != 0);
/* Next, change any commas to newlines, because we want newline-separated attendees. */
j = strlen(form_attendees);
@@ -644,12 +1090,11 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
}
}
- /** Now iterate! */
+ /* Now iterate! */
for (i=0; i| \n");
+ wc_printf(" \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(" \n"); - wprintf("SEQUENCE == %d \n", sequence); + wc_printf(" \n"); + wc_printf("SEQUENCE == %d \n", sequence); *************************************************************/ - wprintf(" | ||||||
| ");
- wprintf(_("Attendees"));
- wprintf(" " - ""); - wprintf(_("(One per line)")); - wprintf("\n"); + /* Attendees tab (need to move things here) */ + begin_tab(1, 3); + wc_printf("
\n"); /* begin 'rrule_div' div */
+
+ wc_printf(" \n"); /* end 'rrule' div */
+
+ end_tab(2, 3);
- /** Done with properties. */
- wprintf("
|
![](\"static/viewcontacts_24x.gif\"){kind=small}
"
+ "