sprintf(divname, "rsvp%04x", ++divcount);
+ /* Convert timezones to something easy to display.
+ * It's safe to do this in memory because we're only changing it on the
+ * display side -- when we tell the server to do something with the object,
+ * the server will be working with its original copy in the database.
+ */
+ if ((cal) && (recursion_level == 0)) {
+ ical_dezonify(cal);
+ }
+
/* Leading HTML for the display of this object */
if (recursion_level == 0) {
StrBufAppendPrintf(Target, "<div class=\"mimepart\">\n");
/* See what we need to do with this */
if (method != NULL) {
- the_method = icalproperty_get_method(method);
char *title;
+ the_method = icalproperty_get_method(method);
StrBufAppendPrintf(Target, "<div id=\"%s_title\">", divname);
StrBufAppendPrintf(Target, "<img src=\"static/calarea_48x.gif\">");
StrBufAppendPrintf(Target, "</dd>\n");
}
+ if (icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY)) {
+ /* Unusual string syntax used here in order to re-use existing translations */
+ StrBufAppendPrintf(Target, "<dt>%s:</dt><dd>%s.</dd>\n",
+ _("Recurrence"),
+ _("This is a recurring event")
+ );
+ }
+
/* If the component has attendees, iterate through them. */
for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY);
(p != NULL);
/* If this is a REPLY, display update button */
if (the_method == ICAL_METHOD_REPLY) {
- /* In the future, if we want to validate this object before
- * continuing, we can do it this way:
- serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum);
- serv_getln(buf, sizeof buf);
- }
- ***********/
-
/* Display the update buttons */
StrBufAppendPrintf(Target, "<p id=\"%s_question\" >"
"%s "
}
-/**
- * \brief process calendar mail atachment
- * Deserialize a calendar object in a message so it can be processed.
- * (This is the main entry point for these things)
- * \param part_source the part of the message we want to parse
- * \param msgnum number of the mesage in our db
- * \param cal_partnum the number of the calendar item
+/*
+ * Deserialize a calendar object in a message so it can be displayed.
+ *
*/
void cal_process_attachment(wc_mime_attachment *Mime)
{
-/*@}*/
-/*-----------------------------------------------------------------------**/
-
-
-/**
- * \defgroup MsgDisplayHandlers Display handlers for message reading
- * \ingroup Calendaring
- */
-
-/*@{*/
-
-int Flathash(const char *str, long len)
-{
- if (len != sizeof (int))
- return 0;
- else return *(int*)str;
-}
-
-
-
-/**
- * \brief clean up ical memory
- * todo this could get trouble with future ical versions
+/*
+ * free memory allocated using libical
*/
void delete_cal(void *vCal)
{
icalproperty *ps = NULL;
struct icaltimetype dtstart, dtend;
struct icaldurationtype dur;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
disp_cal *Cal;
size_t len;
time_t final_recurrence = 0;
+ icalcomponent *cptr = NULL;
/* recur variables */
icalproperty *rrule = NULL;
icalrecur_iterator *ritr = NULL;
struct icaltimetype next;
int num_recur = 0;
+ int stop_rr = 0;
dtstart = icaltime_null_time();
dtend = icaltime_null_time();
/* Note: anything we do here, we also have to do below for the recurrences. */
Cal = (disp_cal*) malloc(sizeof(disp_cal));
memset(Cal, 0, sizeof(disp_cal));
-
Cal->cal = icalcomponent_new_clone(cal);
+
+ /* Dezonify and decapsulate at the very last moment */
+ /* lprintf(9, "INITIAL: %s\n", icaltime_as_ical_string(icalproperty_get_dtstart(
+ icalcomponent_get_first_property(icalcomponent_get_first_component(
+ Cal->cal, ICAL_VEVENT_COMPONENT), ICAL_DTSTART_PROPERTY)))
+ ); */
+ ical_dezonify(Cal->cal);
+ if (icalcomponent_isa(Cal->cal) != ICAL_VEVENT_COMPONENT) {
+ cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+ if (cptr) {
+ cptr = icalcomponent_new_clone(cptr);
+ icalcomponent_free(Cal->cal);
+ Cal->cal = cptr;
+ }
+ }
+
Cal->unread = unread;
len = strlen(from);
Cal->from = (char*)malloc(len+ 1);
/* Do the same for the ending date and time. It makes the day view much easier to render. */
ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
if (ps != NULL) {
- dtend = icalproperty_get_dtstart(ps);
+ dtend = icalproperty_get_dtend(ps);
Cal->event_end = icaltime_as_timet(dtend);
}
Cal,
delete_cal);
- /* handle recurring events */
+ /****************************** handle recurring events ******************************/
if (icaltime_is_null_time(dtstart)) return; /* Can't recur without a start time */
* adding new hash entries that all point back to the same msgnum, until either the iteration
* stops or some outer bound is reached. The display code will automatically do the Right Thing.
*/
-
- rrule = icalcomponent_get_first_property(Cal->cal, ICAL_RRULE_PROPERTY);
+ cptr = cal;
+ if (icalcomponent_isa(cptr) != ICAL_VEVENT_COMPONENT) {
+ cptr = icalcomponent_get_first_component(cptr, ICAL_VEVENT_COMPONENT);
+ }
+ if (!cptr) return;
+ ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+ if (ps == NULL) return;
+ dtstart = icalproperty_get_dtstart(ps);
+ rrule = icalcomponent_get_first_property(cptr, ICAL_RRULE_PROPERTY);
if (!rrule) return;
recur = icalproperty_get_rrule(rrule);
ritr = icalrecur_iterator_new(recur, dtstart);
if (!ritr) return;
- int stop_rr = 0;
while (next = icalrecur_iterator_next(ritr), ((!icaltime_is_null_time(next))&&(!stop_rr)) ) {
++num_recur;
-
if (num_recur > 1) { /* Skip the first one. We already did it at the root. */
+ icalcomponent *cptr;
+ /* lprintf(9, "REPEATS: %s\n", icaltime_as_ical_string(next)); */
/* Note: anything we do here, we also have to do above for the root event. */
Cal = (disp_cal*) malloc(sizeof(disp_cal));
memset(Cal, 0, sizeof(disp_cal));
-
Cal->cal = icalcomponent_new_clone(cal);
Cal->unread = unread;
len = strlen(from);
Cal->from = (char*)malloc(len+ 1);
memcpy(Cal->from, from, len + 1);
Cal->cal_msgnum = msgnum;
-
- ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
- if (ps != NULL) {
- icalcomponent_remove_property(Cal->cal, ps);
- ps = icalproperty_new_dtstart(next);
- icalcomponent_add_property(Cal->cal, ps);
- Cal->event_start = icaltime_as_timet(next);
- final_recurrence = Cal->event_start;
+
+ if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
+ cptr = Cal->cal;
+ }
+ else {
+ cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
}
+ if (cptr) {
+ ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+ if (ps != NULL) {
+ icalcomponent_remove_property(cptr, ps);
+ ps = icalproperty_new_dtstart(next);
+ icalcomponent_add_property(cptr, ps);
- ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
- if (ps != NULL) {
- icalcomponent_remove_property(Cal->cal, ps);
+ Cal->event_start = icaltime_as_timet(next);
+ final_recurrence = Cal->event_start;
+ }
- /* Make a new dtend */
- ps = icalproperty_new_dtend(icaltime_add(next, dur));
+ ps = icalcomponent_get_first_property(cptr, ICAL_DTEND_PROPERTY);
+ if (ps != NULL) {
+ icalcomponent_remove_property(cptr, ps);
- /* and stick it somewhere */
- icalcomponent_add_property(Cal->cal, ps);
+ /* Make a new dtend */
+ ps = icalproperty_new_dtend(icaltime_add(next, dur));
+
+ /* and stick it somewhere */
+ icalcomponent_add_property(cptr, ps);
+ }
+
}
-
+
+ /* Dezonify and decapsulate at the very last moment */
+ ical_dezonify(Cal->cal);
+ if (icalcomponent_isa(Cal->cal) != ICAL_VEVENT_COMPONENT) {
+ cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+ if (cptr) {
+ cptr = icalcomponent_new_clone(cptr);
+ icalcomponent_free(Cal->cal);
+ Cal->cal = cptr;
+ }
+ }
+
if ( (Cal->event_start > calv->lower_bound)
&& (Cal->event_start < calv->upper_bound) ) {
Put(WCC->disp_cal_items,
created_new_vtodo = 1;
}
- // TODO: Can we take all this and move it into a template?
+ /*/ TODO: Can we take all this and move it into a template? */
output_headers(1, 1, 1, 0, 0, 0);
wprintf("<!-- start task edit form -->");
p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
- // Get summary early for title
+ /* Get summary early for title */
wprintf("<div class=\"box\">\n");
wprintf("<div class=\"boxlabel\">");
wprintf(_("Edit task"));
wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
wprintf("<div style=\"display: none;\">\n ");
wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
- msgnum);
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
+ ibstr("return_to_summary"));
wprintf("</div>");
wprintf("<table class=\"calendar_background\"><tr><td>");
wprintf("<TABLE STYLE=\"border: none;\">\n");
}
wprintf(" >");
wprintf("</TD></TR>");
- // start category field
+ /* start category field */
p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY);
wprintf("<TR><TD>");
wprintf(_("Category:"));
}
wprintf("\">");
wprintf("</TD></TR>\n ");
- // end category field
+ /* end category field */
wprintf("<TR><TD>");
wprintf(_("Description:"));
wprintf("</TD><TD>");
icalcomponent_free(vtodo);
}
- /** Go back to the task list */
- readloop("readfwd");
+ /* Go back to wherever we came from */
+ if (ibstr("return_to_summary") == 1) {
+ summary();
+ }
+ else {
+ readloop(readfwd);
+ }
}
cal = icalcomponent_new_from_string(relevant_source);
if (cal != NULL) {
- /* Simple components of desired type */
- if (icalcomponent_isa(cal) == which_kind) {
+ /* A which_kind of (-1) means just load the whole thing */
+ if (which_kind == (-1)) {
callback(cal, msgnum, from, unread, calv);
}
- /* Subcomponents of desired type */
- for (c = icalcomponent_get_first_component(cal, which_kind);
- (c != 0);
- c = icalcomponent_get_next_component(cal, which_kind)) {
- callback(c, msgnum, from, unread, calv);
+ /* Otherwise recurse and hunt */
+ else {
+
+ /* Simple components of desired type */
+ if (icalcomponent_isa(cal) == which_kind) {
+ callback(cal, msgnum, from, unread, calv);
+ }
+
+ /* Subcomponents of desired type */
+ for (c = icalcomponent_get_first_component(cal, which_kind);
+ (c != 0);
+ c = icalcomponent_get_next_component(cal, which_kind)) {
+ callback(c, msgnum, from, unread, calv);
+ }
+
}
+
icalcomponent_free(cal);
}
free(relevant_source);
* Display a calendar item
*/
void load_calendar_item(message_summary *Msg, int unread, struct calview *c) {
- load_ical_object(Msg->msgnum, unread, ICAL_VEVENT_COMPONENT, display_individual_cal, c);
+ /*load_ical_object(Msg->msgnum, unread, ICAL_VEVENT_COMPONENT, display_individual_cal, c);*/
+ load_ical_object(Msg->msgnum, unread, (-1), display_individual_cal, c);
}
/*
/* Force change the room if we have to */
if (havebstr("taskrm")) {
- gotoroom((char *)bstr("taskrm"));
+ gotoroom(sbstr("taskrm"));
}
msgnum = lbstr("msgnum");
msgnum = lbstr("msgnum");
if (msgnum > 0L) {
- load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, save_individual_event, NULL);
+ /* load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, save_individual_event, NULL); */
+ load_ical_object(msgnum, 0, (-1), save_individual_event, NULL);
}
else {
save_individual_event(NULL, 0L, "", 0, NULL);
projects / citadel.git / blobdiff