-/*
- * $Id$
- *
- * Functions which handle calendar objects and their processing/display.
- */
+// Functions which handle calendar objects and their processing/display.
+//
+// Copyright (c) 1996-2022 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"
-/*
- * 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
- */
+// 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(StrBuf *Target,
icalcomponent *cal,
int recursion_level,
int is_update = 0;
char divname[32];
static int divcount = 0;
+ const char *ch;
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.
- */
+ // 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 */
+ // Leading HTML for the display of this object
if (recursion_level == 0) {
StrBufAppendPrintf(Target, "<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) {
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, "<img src=\"static/webcit_icons/essen/32x32/calendar.png\">");
StrBufAppendPrintf(Target, "<span>");
switch(the_method) {
case ICAL_METHOD_REQUEST:
StrBufAppendPrintf(Target, "</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.
- */
+ // 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);
}
if (icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY)) {
- /* Unusual string syntax used here in order to re-use existing translations */
+ // 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. */
+ // 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)) {
StrBufAppendPrintf(Target, "<dt>");
StrBufAppendPrintf(Target, _("Attendee:"));
StrBufAppendPrintf(Target, "</dt><dd>");
- safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
- if (!strncasecmp(buf, "MAILTO:", 7)) {
+ ch = icalproperty_get_attendee(p);
+ if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
- /** screen name or email address */
- strcpy(buf, &buf[7]);
- striplt(buf);
+ // screen name or email address
+ safestrncpy(buf, ch + 7, sizeof(buf));
+ string_trim(buf);
StrEscAppend(Target, NULL, buf, 0, 0);
StrBufAppendPrintf(Target, " ");
- /** participant status */
+ // participant status
partstat_as_string(buf, p);
StrEscAppend(Target, NULL, buf, 0, 0);
}
StrBufAppendPrintf(Target, "</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)) {
- /* Recursively process subcomponent */
+ (c != 0);
+ c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)
+ ) {
+ // Recursively process subcomponent
cal_process_object(Target, 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 */
- lprintf(9, "Checking server calendar for conflicts...\n");
+ // Check for conflicts
+ syslog(LOG_DEBUG, "Checking server calendar for conflicts...");
serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
StrBufAppendPrintf(Target, "</dd>\n");
}
}
- lprintf(9, "...done.\n");
+ syslog(LOG_DEBUG, "...done.\n");
StrBufAppendPrintf(Target, "</dl>");
- /* Display the Accept/Decline buttons */
+ // Display the Accept/Decline buttons
StrBufAppendPrintf(Target, "<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) {
- /* Display the update buttons */
+ // Display the update buttons
StrBufAppendPrintf(Target, "<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) {
StrBufAppendPrintf(Target, "<p> </p></div>\n");
}
}
-/*
- * Deserialize a calendar object in a message so it can be displayed.
- */
-void cal_process_attachment(wc_mime_attachment *Mime)
-{
+// Deserialize a calendar object in a message so it can be displayed.
+void cal_process_attachment(wc_mime_attachment *Mime) {
icalcomponent *cal;
cal = icalcomponent_new_from_string(ChrPtr(Mime->Data));
FlushStrBuf(Mime->Data);
if (cal == NULL) {
StrBufAppendPrintf(Mime->Data, _("There was an error parsing this calendar item."));
- StrBufAppendPrintf(Mime->Data, "<br />\n");
+ StrBufAppendPrintf(Mime->Data, "<br>\n");
return;
}
cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum));
- /* Free the memory we obtained from libical's constructor */
+ // Free the memory we obtained from libical's constructor
icalcomponent_free(cal);
}
-
-
-/*
- * Respond to a meeting request - accept/decline meeting
- */
-void respond_to_request(void)
-{
+// Respond to a meeting request - accept/decline meeting
+void respond_to_request(void) {
char buf[1024];
begin_ajax_response();
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<img src=\"static/calarea_48x.gif\"><span>");
+ wc_printf("<img src=\"static/webcit_icons/essen/32x32/calendar.png\"><span>");
if (!strcasecmp(bstr("sc"), "accept")) {
- wprintf(_("You have accepted this meeting invitation. "
+ wc_printf(_("You have accepted this meeting invitation. "
"It has been entered into your calendar.")
);
- } else if (!strcasecmp(bstr("sc"), "tentative")) {
- wprintf(_("You have tentatively accepted this meeting invitation. "
+ }
+ else if (!strcasecmp(bstr("sc"), "tentative")) {
+ wc_printf(_("You have tentatively accepted this meeting invitation. "
"It has been 'pencilled in' to your calendar.")
);
- } else if (!strcasecmp(bstr("sc"), "decline")) {
- wprintf(_("You have declined this meeting invitation. "
+ }
+ else if (!strcasecmp(bstr("sc"), "decline")) {
+ wc_printf(_("You have declined this meeting invitation. "
"It has <b>not</b> been entered into your calendar.")
);
}
- wprintf(" ");
- wprintf(_("A reply has been sent to the meeting organizer."));
- wprintf("</span>");
- } else {
- wprintf("<img align=\"center\" src=\"static/error.gif\"><span>");
- wprintf("%s\n", &buf[4]);
- wprintf("</span>");
+ wc_printf(" ");
+ wc_printf(_("A reply has been sent to the meeting organizer."));
+ wc_printf("</span>");
+ }
+ else {
+ wc_printf("<img align=\"center\" src=\"static/webcit_icons/error.gif\"><span>");
+ wc_printf("%s\n", &buf[4]);
+ wc_printf("</span>");
}
-
end_ajax_response();
}
-
-/*
- * Handle an incoming RSVP
- */
-void handle_rsvp(void)
-{
+// Handle an incoming RSVP
+void handle_rsvp(void) {
char buf[1024];
begin_ajax_response();
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<img src=\"static/calarea_48x.gif\"><span>");
+ wc_printf("<img src=\"static/webcit_icons/calendar.png\"><span>");
if (!strcasecmp(bstr("sc"), "update")) {
- wprintf(_("Your calendar has been updated to reflect this RSVP."));
- } else if (!strcasecmp(bstr("sc"), "ignore")) {
- wprintf(_("You have chosen to ignore this RSVP. "
+ // Translators: RSVP aka Répondez s'il-vous-plaît is the term
+ // that the recipient of an ical-invitation should please
+ // answer this request.
+ wc_printf(_("Your calendar has been updated to reflect this RSVP."));
+ }
+ else if (!strcasecmp(bstr("sc"), "ignore")) {
+ wc_printf(_("You have chosen to ignore this RSVP. "
"Your calendar has <b>not</b> been updated.")
- );
+ );
}
- wprintf("</span>");
- } else {
- wprintf("<img src=\"static/error.gif\"><span> %s\n", &buf[4]);
- wprintf("</span>");
+ wc_printf("</span>");
+ }
+ else {
+ wc_printf("<img src=\"static/webcit_icons/error.gif\"><span> %s\n", &buf[4]);
+ wc_printf("</span>");
}
end_ajax_response();
}
-
-
-/*
- * free memory allocated using libical
- */
-void delete_cal(void *vCal)
-{
+// free memory allocated using libical
+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, calview *calv)
-{
+
+// 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 *event, long msgnum, char *from, int unread, calview *calv) {
icalproperty *ps = NULL;
struct icaltimetype dtstart, dtend;
struct icaldurationtype dur;
time_t final_recurrence = 0;
icalcomponent *cptr = NULL;
- /* recur variables */
+ // recur variables
icalproperty *rrule = NULL;
struct icalrecurrencetype recur;
icalrecur_iterator *ritr = NULL;
int num_recur = 0;
int stop_rr = 0;
+ // first and foremost, check for bogosity. bail if we see no DTSTART property
+ if (icalcomponent_get_first_property(icalcomponent_get_first_component(
+ event, ICAL_VEVENT_COMPONENT), ICAL_DTSTART_PROPERTY) == NULL
+ ) {
+ return;
+ }
+
+ // ok, chances are we've got a live one here. let's try to figure out where it goes.
+
dtstart = icaltime_null_time();
dtend = icaltime_null_time();
- if (WCC->disp_cal_items == NULL)
+ if (WCC->disp_cal_items == NULL) {
WCC->disp_cal_items = NewHash(0, Flathash);
+ }
- /* Note: anything we do here, we also have to do below for the recurrences. */
+ // 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);
+ Cal->cal = icalcomponent_new_clone(event);
- /* 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)))
- ); */
+ // 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);
memcpy(Cal->from, from, len + 1);
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.
- */
+ // 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) {
dtstart = icalproperty_get_dtstart(ps);
Cal->event_start = icaltime_as_timet(dtstart);
}
- /* Do the same for the ending date and time. It makes the day view much easier to render. */
+ // 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_dtend(ps);
Cal->event_end = icaltime_as_timet(dtend);
}
- /* Store it in the hash list. */
- Put(WCC->disp_cal_items,
- (char*) &Cal->event_start,
- sizeof(Cal->event_start),
- Cal,
- delete_cal);
+ // Store it in the hash list.
+ // syslog(LOG_DEBUG, "INITIAL: %s", ctime(&Cal->event_start));
+ Put(WCC->disp_cal_items, (char*) &Cal->event_start, sizeof(Cal->event_start), Cal, delete_cal);
- /****************************** handle recurring events ******************************/
+ //***************************** handle recurring events ******************************
if (icaltime_is_null_time(dtstart)) return; /* Can't recur without a start time */
if (!icaltime_is_null_time(dtend)) { /* Need duration for recurrences */
dur = icaltime_subtract(dtend, dtstart);
}
+ else {
+ dur = icaltime_subtract(dtstart, dtstart);
+ }
/*
* 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 will automatically do the Right Thing.
*/
- cptr = cal;
+ cptr = event;
if (icalcomponent_isa(cptr) != ICAL_VEVENT_COMPONENT) {
cptr = icalcomponent_get_first_component(cptr, ICAL_VEVENT_COMPONENT);
}
++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->cal = icalcomponent_new_clone(event);
Cal->unread = unread;
len = strlen(from);
Cal->from = (char*)malloc(len+ 1);
cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
}
if (cptr) {
- ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
- if (ps != NULL) {
+
+ /* Remove any existing DTSTART properties */
+ while (ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY), ps != NULL) {
icalcomponent_remove_property(cptr, ps);
- ps = icalproperty_new_dtstart(next);
- icalcomponent_add_property(cptr, ps);
-
- Cal->event_start = icaltime_as_timet(next);
- final_recurrence = Cal->event_start;
}
- ps = icalcomponent_get_first_property(cptr, ICAL_DTEND_PROPERTY);
- if (ps != NULL) {
+ /* Add our shiny new DTSTART property from the iteration */
+ ps = icalproperty_new_dtstart(next);
+ icalcomponent_add_property(cptr, ps);
+ Cal->event_start = icaltime_as_timet(next);
+ final_recurrence = Cal->event_start;
+
+ /* Remove any existing DTEND properties */
+ while (ps = icalcomponent_get_first_property(cptr, ICAL_DTEND_PROPERTY), (ps != NULL)) {
icalcomponent_remove_property(cptr, ps);
-
- /* Make a new dtend */
- ps = icalproperty_new_dtend(icaltime_add(next, dur));
-
- /* and stick it somewhere */
- icalcomponent_add_property(cptr, ps);
}
+ /* Add our shiny new DTEND property from the iteration */
+ ps = icalproperty_new_dtend(icaltime_add(next, dur));
+ icalcomponent_add_property(cptr, ps);
+
}
/* Dezonify and decapsulate at the very last moment */
}
}
- if ( (Cal->event_start > calv->lower_bound)
- && (Cal->event_start < calv->upper_bound) ) {
+ if ( (Cal->event_start > calv->lower_bound)
+ && (Cal->event_start < calv->upper_bound)
+ ) {
+ /* syslog(LOG_DEBUG, "REPEATS: %s", ctime(&Cal->event_start)); */
Put(WCC->disp_cal_items,
(char*) &Cal->event_start,
sizeof(Cal->event_start),
}
}
icalrecur_iterator_free(ritr);
- /* lprintf(9, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); */
-
+ /* syslog(LOG_DEBUG, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); */
}
-
-
-
-
void process_ical_object(long msgnum, int unread,
char *from,
char *FlatIcal,
icalcomponent_kind which_kind,
IcalCallbackFunc CallBack,
calview *calv
- )
-{
+) {
icalcomponent *cal, *c;
cal = icalcomponent_new_from_string(FlatIcal);
}
}
-/*
- * Code common to all icalendar display handlers. Given a message number and a MIME
- * type, we load the message and hunt for that MIME type. If found, we load
- * the relevant part, deserialize it into a libical component, filter it for
- * the requested object type, and feed it to the specified handler.
- */
+// Code common to all icalendar display handlers. Given a message number and a MIME
+// type, we load the message and hunt for that MIME type. If found, we load
+// the relevant part, deserialize it into a libical component, filter it for
+// the requested object type, and feed it to the specified handler.
void load_ical_object(long msgnum, int unread,
icalcomponent_kind which_kind,
IcalCallbackFunc CallBack,
calview *calv,
int RenderAsync
- )
-{
+) {
StrBuf *Buf;
StrBuf *Data = NULL;
const char *bptr;
char mime_filename[256];
char mime_content_type[256];
char mime_disposition[256];
- int mime_length;
char relevant_partnum[256];
char *relevant_source = NULL;
int phase = 0; /* 0 = citadel headers, 1 = mime headers, 2 = body */
extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum);
extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition);
extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type);
- mime_length = extract_int(&bptr[5], 5);
+ /* do we care? mime_length = */extract_int(&bptr[5], 5);
if ( (!strcasecmp(mime_content_type, "text/calendar"))
|| (!strcasecmp(mime_content_type, "application/ics"))
|| (!strcasecmp(mime_content_type, "text/vtodo"))
|| (!strcasecmp(mime_content_type, "text/todo"))
- ) {
+ ) {
strcpy(relevant_partnum, mime_partnum);
}
}
if (!IsEmptyStr(bptr)) {
if (!strncasecmp(bptr, "Content-type: ", 14)) {
safestrncpy(msg4_content_type, &bptr[14], sizeof msg4_content_type);
- striplt(msg4_content_type);
+ string_trim(msg4_content_type);
}
else if (!strncasecmp(bptr, "Content-transfer-encoding: ", 27)) {
safestrncpy(msg4_content_encoding, &bptr[27], sizeof msg4_content_encoding);
- striplt(msg4_content_type);
+ string_trim(msg4_content_type);
}
else if ((!strncasecmp(bptr, "Content-length: ", 16))) {
msg4_content_length = atoi(&bptr[16]);
}
FreeStrBuf(&Buf);
- /* If MSG4 didn't give us the part we wanted, but we know that we can find it
- * as one of the other MIME parts, attempt to load it now.
- */
+ // If MSG4 didn't give us the part we wanted, but we know that we can find it
+ // as one of the other MIME parts, attempt to load it now.
if ((Data == NULL) && (!IsEmptyStr(relevant_partnum))) {
Data = load_mimepart(msgnum, relevant_partnum);
}
icalmemory_free_ring();
}
-/*
- * Display a calendar item
- */
-int calendar_LoadMsgFromServer(SharedMessageStatus *Stat,
- void **ViewSpecific,
- message_summary* Msg,
- int is_new,
- int i)
-{
+
+// Display a calendar item
+int calendar_LoadMsgFromServer(SharedMessageStatus *Stat, void **ViewSpecific, message_summary* Msg, int is_new, int i) {
calview *c = (calview*) *ViewSpecific;
load_ical_object(Msg->msgnum, is_new, (-1), display_individual_cal, c, 1);
return 0;
}
-/*
- * display the editor component for an event
- */
+
+// display the editor component for an event
void display_edit_event(void) {
long msgnum = 0L;
msgnum = lbstr("msgnum");
if (msgnum > 0L) {
- /* existing event */
+ // existing event
load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, display_edit_individual_event, NULL, 0);
}
else {
- /* new event */
+ // new event
display_edit_individual_event(NULL, 0L, "", 0, NULL);
}
}
-/*
- * save an edited event
- */
+
+// save an edited event
void save_event(void) {
long msgnum = 0L;
}
-
-
-
-/*
- * Anonymous request of freebusy data for a user
- */
-void do_freebusy(void)
-{
+// Anonymous request of freebusy data for a user
+void do_freebusy(void) {
const char *req = ChrPtr(WC->Hdr->HR.ReqLine);
char who[SIZ];
char buf[SIZ];
who[len-4] = 0;
}
- lprintf(9, "freebusy requested for <%s>\n", who);
+ syslog(LOG_INFO, "freebusy requested for <%s>\n", who);
serv_printf("ICAL freebusy|%s", who);
serv_getln(buf, sizeof buf);
hprintf("HTTP/1.1 404 %s\n", &buf[4]);
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf("%s\n", &buf[4]);
+ wc_printf("%s\n", &buf[4]);
end_burst();
return;
}
}
-
-int calendar_Cleanup(void **ViewSpecific)
-{
+int calendar_Cleanup(void **ViewSpecific) {
calview *c;
c = (calview *) *ViewSpecific;
}
+int __calendar_Cleanup(void **ViewSpecific) {
+ calview *c;
+
+ c = (calview *) *ViewSpecific;
+
+ free (c);
+ *ViewSpecific = NULL;
+
+ return 0;
+}
+
+
void
InitModule_CALENDAR
(void)
VIEW_CALENDAR,
calendar_GetParamsGetServerCall,
NULL,
+ NULL,
+ NULL,
calendar_LoadMsgFromServer,
calendar_RenderView_or_Tail,
- calendar_Cleanup);
+ calendar_Cleanup,
+ NULL);
RegisterReadLoopHandlerset(
VIEW_CALBRIEF,
calendar_GetParamsGetServerCall,
NULL,
+ NULL,
+ NULL,
calendar_LoadMsgFromServer,
calendar_RenderView_or_Tail,
- calendar_Cleanup);
+ calendar_Cleanup,
+ NULL);
RegisterPreference("dayend", _("Calendar day view ends at:"), PRF_INT, NULL);
RegisterPreference("weekstart", _("Week starts on:"), PRF_INT, NULL);
- WebcitAddUrlHandler(HKEY("freebusy"), do_freebusy, COOKIEUNNEEDED|ANONYMOUS|FORCE_SESSIONCLOSE);
- WebcitAddUrlHandler(HKEY("display_edit_task"), display_edit_task, 0);
- WebcitAddUrlHandler(HKEY("display_edit_event"), display_edit_event, 0);
- WebcitAddUrlHandler(HKEY("save_event"), save_event, 0);
- WebcitAddUrlHandler(HKEY("respond_to_request"), respond_to_request, 0);
- WebcitAddUrlHandler(HKEY("handle_rsvp"), handle_rsvp, 0);
+ WebcitAddUrlHandler(HKEY("freebusy"), "", 0, do_freebusy, COOKIEUNNEEDED|ANONYMOUS|FORCE_SESSIONCLOSE);
+ WebcitAddUrlHandler(HKEY("display_edit_task"), "", 0, display_edit_task, 0);
+ WebcitAddUrlHandler(HKEY("display_edit_event"), "", 0, display_edit_event, 0);
+ WebcitAddUrlHandler(HKEY("save_event"), "", 0, save_event, 0);
+ WebcitAddUrlHandler(HKEY("respond_to_request"), "", 0, respond_to_request, 0);
+ WebcitAddUrlHandler(HKEY("handle_rsvp"), "", 0, handle_rsvp, 0);
}
projects / citadel.git / blobdiff