/*
- * \brief Process a calendar object
- * ...at this point it's already been deserialized by cal_process_attachment()
- * \param cal the calendar object
- * \param recursion_level call stack depth ??????
- * \param msgnum number of the mesage in our db
- * \param cal_partnum of the calendar object ????
+ * Process a calendar object. At this point it's already been deserialized by cal_process_attachment()
+ *
+ * cal: the calendar object
+ * recursion_level: Number of times we've recursed into this function
+ * msgnum: Message number on the Citadel server
+ * cal_partnum: MIME part number within that message containing the calendar object
*/
void cal_process_object(icalcomponent *cal,
int recursion_level,
sprintf(divname, "rsvp%04x", ++divcount);
- /** Leading HTML for the display of this object */
+ /* Leading HTML for the display of this object */
if (recursion_level == 0) {
wprintf("<div class=\"mimepart\">\n");
}
- /** Look for a method */
+ /* Look for a method */
method = icalcomponent_get_first_property(cal, ICAL_METHOD_PROPERTY);
- /** See what we need to do with this */
+ /* See what we need to do with this */
if (method != NULL) {
the_method = icalproperty_get_method(method);
char *title;
wprintf("</dd>\n");
}
- /**
+ /*
* Only show start/end times if we're actually looking at the VEVENT
* component. Otherwise it shows bogus dates for things like timezone.
*/
if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) {
- p = icalcomponent_get_first_property(cal,
- ICAL_DTSTART_PROPERTY);
+ p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t = icalproperty_get_dtstart(p);
wprintf("</dd>\n");
}
- /** If the component has attendees, iterate through them. */
+ /* If the component has attendees, iterate through them. */
for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY);
(p != NULL);
p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) {
wprintf("</dd>\n");
}
- /** If the component has subcomponents, recurse through them. */
+ /* If the component has subcomponents, recurse through them. */
for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
(c != 0);
c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
cal_process_object(c, recursion_level+1, msgnum, cal_partnum);
}
- /** If this is a REQUEST, display conflicts and buttons */
+ /* If this is a REQUEST, display conflicts and buttons */
if (the_method == ICAL_METHOD_REQUEST) {
/* Check for conflicts */
wprintf("</dl>");
- /** Display the Accept/Decline buttons */
+ /* Display the Accept/Decline buttons */
wprintf("<p id=\"%s_question\">"
"%s "
" <span class=\"button_link\"> "
}
- /** If this is a REPLY, display update button */
+ /* If this is a REPLY, display update button */
if (the_method == ICAL_METHOD_REPLY) {
- /** \todo In the future, if we want to validate this object before \
+ /* 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 */
+ /* Display the update buttons */
wprintf("<p id=\"%s_question\" >"
"%s "
" <span class=\"button_link\"> "
}
- /** Trailing HTML for the display of this object */
+ /* Trailing HTML for the display of this object */
if (recursion_level == 0) {
wprintf("<p> </p></div>\n");
}
/*@{*/
+int Flathash(const char *str, long len)
+{
+ if (len != sizeof (int))
+ return 0;
+ else return *(int*)str;
+}
+
/**
- * \brief get items, keep them.
- * If we're reading calendar items, just store them for now. We have to
- * sort and re-output them later when we draw the calendar.
- * \param cal Our calendar to process
- * \param msgnum number of the mesage in our db
+ * \brief clean up ical memory
+ * todo this could get trouble with future ical versions
+ */
+void delete_cal(void *vCal)
+{
+ disp_cal *Cal = (disp_cal*) vCal;
+ icalcomponent_free(Cal->cal);
+ free(Cal->from);
+ free(Cal);
+}
+
+/*
+ * This is the meat-and-bones of the first part of our two-phase calendar display.
+ * As we encounter calendar items in messages being read from the server, we break out
+ * any iCalendar objects and store them in a hash table. Later on, the second phase will
+ * use this hash table to render the calendar for display.
*/
void display_individual_cal(icalcomponent *cal, long msgnum, char *from, int unread)
{
- struct wcsession *WCC = WC; /* stack this for faster access (WC is a function) */
-
- WCC->num_cal += 1;
- WCC->disp_cal = realloc(WC->disp_cal, (sizeof(struct disp_cal) * WCC->num_cal) );
- WCC->disp_cal[WCC->num_cal - 1].cal = icalcomponent_new_clone(cal);
- WCC->disp_cal[WCC->num_cal - 1].unread = unread;
- WCC->disp_cal[WCC->num_cal - 1].from = malloc (strlen(from) + 1);
- strcpy (WCC->disp_cal[WCC->num_cal - 1].from, from);
- ical_dezonify(WCC->disp_cal[WCC->num_cal - 1].cal);
- WCC->disp_cal[WCC->num_cal - 1].cal_msgnum = msgnum;
+ icalproperty *ps = NULL;
+ struct icaltimetype t;
+ struct wcsession *WCC = WC;
+ disp_cal *Cal;
+ size_t len;
+
+ if (WCC->disp_cal_items == NULL)
+ WCC->disp_cal_items = NewHash(0, Flathash);
+
+ 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);
+ ical_dezonify(Cal->cal);
+ Cal->cal_msgnum = msgnum;
+
+ /* Precalculate the starting date and time of this event, and store it in our top-level
+ * structure. Later, when we are rendering the calendar, we can just peek at these values
+ * without having to break apart every calendar item.
+ */
+ ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+ if (ps != NULL) {
+ t = icalproperty_get_dtstart(ps);
+ Cal->event_start = icaltime_as_timet(t);
+ }
+
+ /* 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) {
+ t = icalproperty_get_dtstart(ps);
+ Cal->event_end = icaltime_as_timet(t);
+ }
+
+ /* Store it in the hash list. */
+ Put(WCC->disp_cal_items,
+ (char*) &Cal->event_start,
+ sizeof(Cal->event_start),
+ Cal,
+ delete_cal);
+
+ /* Right about here is probably where we want to add code to handle recurring events.
+ * Just let libical iterate the recurrence, and keep looping back to the top of this function,
+ * 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 *should* automatically do the right
+ * thing (but we'll have to see).
+ */
}
-/**
- * \brief edit a task
+/*
* Display a task by itself (for editing)
- * \param supplied_vtodo the todo item we want to edit
- * \param msgnum number of the mesage in our db
*/
void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, char *from, int unread)
{
icalcomponent *vtodo;
icalproperty *p;
- struct icaltimetype t;
+ struct icaltimetype IcalTime;
time_t now;
int created_new_vtodo = 0;
+ icalproperty_status todoStatus;
now = time(NULL);
wprintf("<div class=\"boxcontent\">\n");
wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
wprintf("<div style=\"display: none;\">\n ");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
msgnum);
wprintf("</div>");
wprintf(_("or"));
wprintf(" ");
if (p != NULL) {
- t = icalproperty_get_dtstart(p);
+ IcalTime = icalproperty_get_dtstart(p);
}
- display_icaltimetype_as_webform(&t, "dtstart");
+ else
+ IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
+ display_icaltimetype_as_webform(&IcalTime, "dtstart");
wprintf("</TD></TR>\n");
wprintf("<TR><TD>");
wprintf(_("or"));
wprintf(" ");
if (p != NULL) {
- t = icalproperty_get_due(p);
+ IcalTime = icalproperty_get_due(p);
}
- display_icaltimetype_as_webform(&t, "due");
+ else
+ IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
+ display_icaltimetype_as_webform(&IcalTime, "due");
wprintf("</TD></TR>\n");
- icalproperty_status todoStatus = icalcomponent_get_status(vtodo);
+ todoStatus = icalcomponent_get_status(vtodo);
wprintf("<TR><TD>\n");
wprintf(_("Completed:"));
wprintf("</TD><TD>");
- wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"STATUS\" VALUE=\"COMPLETED\"");
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"status\" VALUE=\"COMPLETED\"");
if (todoStatus == ICAL_STATUS_COMPLETED) {
wprintf(" CHECKED=\"CHECKED\"");
}
icalcomponent_remove_property(vtodo, prop);
icalproperty_free(prop);
}
- if (!IsEmptyStr(bstr("description"))) {
+ if (havebstr("description")) {
icalcomponent_add_property(vtodo,
icalproperty_new_description(bstr("description")));
}
icalcomponent_remove_property(vtodo,prop);
icalproperty_free(prop);
}
- if (!IsEmptyStr(bstr("status"))) {
+ if (havebstr("status")) {
icalproperty_status taskStatus = icalproperty_string_to_status(
bstr("status"));
icalcomponent_set_status(vtodo, taskStatus);
projects / citadel.git / blobdiff