libical, expat, and libsieve are now *required*.

[citadel.git] / citadel / modules / calendar / serv_calendar.c

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index cd55a1339789224d74c61397c130d15f474d5e67..7e0ed46ab22734533ed81baa9837ab9254833d86 100644 (file)
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -19,6 +19,7 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
+#include <ical.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -32,10 +33,6 @@
 #include "serv_calendar.h"
 #include "euidindex.h"
 #include "ctdl_module.h"
-
-#ifdef CITADEL_WITH_CALENDAR_SERVICE
-
-#include <ical.h>
 #include "ical_dezonify.h"
 
 
@@ -264,7 +261,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
                                if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
                                        strcpy(attendee_string, &attendee_string[7]);
                                        striplt(attendee_string);
-                                       recp = validate_recipients(attendee_string);
+                                       recp = validate_recipients(attendee_string, NULL, 0);
                                        if (recp != NULL) {
                                                if (!strcasecmp(recp->recp_local, CC->user.fullname)) {
                                                        if (me_attend) icalproperty_free(me_attend);
@@ -350,7 +347,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
                        reply_message_text);
        
                if (msg != NULL) {
-                       valid = validate_recipients(organizer_string);
+                       valid = validate_recipients(organizer_string, NULL, 0);
                        CtdlSubmitMsg(msg, valid, "");
                        CtdlFreeMessage(msg);
                        free_recipients(valid);
@@ -383,7 +380,8 @@ void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
                }
        }
 
-       if (strcasecmp(cbtype, "text/calendar")) {
+       if (  (strcasecmp(cbtype, "text/calendar"))
+          && (strcasecmp(cbtype, "application/ics")) ) {
                return;
        }
 
@@ -529,7 +527,8 @@ void ical_locate_original_event(char *name, char *filename, char *partnum, char
 
        struct original_event_container *oec = NULL;
 
-       if (strcasecmp(cbtype, "text/calendar")) {
+       if (  (strcasecmp(cbtype, "text/calendar"))
+          && (strcasecmp(cbtype, "application/ics")) ) {
                return;
        }
        oec = (struct original_event_container *) cbuserdata;
@@ -1214,7 +1213,7 @@ void ical_freebusy(char *who) {
        /* If not found, try it as an unqualified email address. */
        if (found_user != 0) {
                strcpy(buf, who);
-               recp = validate_recipients(buf);
+               recp = validate_recipients(buf, NULL, 0);
                lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
                if (recp != NULL) {
                        if (recp->num_local == 1) {
@@ -1230,7 +1229,7 @@ void ical_freebusy(char *who) {
        if (found_user != 0) {
                snprintf(buf, sizeof buf, "%s@%s", who, config.c_fqdn);
                lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
-               recp = validate_recipients(buf);
+               recp = validate_recipients(buf, NULL, 0);
                if (recp != NULL) {
                        if (recp->num_local == 1) {
                                found_user = getuser(&usbuf, recp->recp_local);
@@ -1253,7 +1252,7 @@ void ical_freebusy(char *who) {
                           || (!strcasecmp(type, "directory")) ) {
                                snprintf(buf, sizeof buf, "%s@%s", who, host);
                                lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
-                               recp = validate_recipients(buf);
+                               recp = validate_recipients(buf, NULL, 0);
                                if (recp != NULL) {
                                        if (recp->num_local == 1) {
                                                found_user = getuser(&usbuf, recp->recp_local);
@@ -1678,6 +1677,7 @@ void ical_send_out_invitations(icalcomponent *cal) {
        icalproperty *attendee = NULL;
        char summary_string[SIZ];
        icalproperty *summary = NULL;
+       size_t reqsize;
 
        if (cal == NULL) {
                lprintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
@@ -1776,9 +1776,10 @@ void ical_send_out_invitations(icalcomponent *cal) {
        icalcomponent_free(encaps);     /* Don't need this anymore. */
        if (serialized_request == NULL) return;
 
-       request_message_text = malloc(strlen(serialized_request) + SIZ);
+       reqsize = strlen(serialized_request) + SIZ;
+       request_message_text = malloc(reqsize);
        if (request_message_text != NULL) {
-               sprintf(request_message_text,
+               snprintf(request_message_text, reqsize,
                        "Content-type: text/calendar\r\n\r\n%s\r\n",
                        serialized_request
                );
@@ -1794,7 +1795,7 @@ void ical_send_out_invitations(icalcomponent *cal) {
                        request_message_text);
        
                if (msg != NULL) {
-                       valid = validate_recipients(attendees_string);
+                       valid = validate_recipients(attendees_string, NULL, 0);
                        CtdlSubmitMsg(msg, valid, "");
                        CtdlFreeMessage(msg);
                        free_recipients(valid);
@@ -1883,7 +1884,8 @@ void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
        imm = (struct icalmessagemod *)cbuserdata;
 
        /* We're only interested in calendar data. */
-       if (strcasecmp(cbtype, "text/calendar")) {
+       if (  (strcasecmp(cbtype, "text/calendar"))
+          && (strcasecmp(cbtype, "application/ics")) ) {
                return;
        }
 
@@ -2018,7 +2020,8 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
        icalcomponent *cal;
 
        /* We're only interested in calendar items here. */
-       if (strcasecmp(cbtype, "text/calendar")) {
+       if (  (strcasecmp(cbtype, "text/calendar"))
+          && (strcasecmp(cbtype, "application/ics")) ) {
                return;
        }
 
@@ -2027,7 +2030,8 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
         * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
         * to that string.
         */
-       if (!strcasecmp(cbtype, "text/calendar")) {
+       if (  (!strcasecmp(cbtype, "text/calendar"))
+          || (!strcasecmp(cbtype, "application/ics")) ) {
                cal = icalcomponent_new_from_string(content);
                if (cal != NULL) {
                        ical_saving_vevent(cal);
@@ -2160,32 +2164,31 @@ void ical_fixed_output(char *ptr, int len) {
 }
 
 
-#endif /* CITADEL_WITH_CALENDAR_SERVICE */
+
+void serv_calendar_destroy(void)
+{
+       icaltimezone_free_builtin_timezones();
+}
 
 /*
  * Register this module with the Citadel server.
  */
 CTDL_MODULE_INIT(calendar)
 {
-#ifdef CITADEL_WITH_CALENDAR_SERVICE
-       CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE);
-       CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE);
-       CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN);
-       CtdlRegisterProtoHook(cmd_ical, "ICAL", "Citadel iCal commands");
-       CtdlRegisterSessionHook(ical_session_startup, EVT_START);
-       CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP);
-       CtdlRegisterFixedOutputHook("text/calendar", ical_fixed_output);
-#endif
-
+       if (!threading)
+       {
+               CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE);
+               CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE);
+               CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN);
+               CtdlRegisterProtoHook(cmd_ical, "ICAL", "Citadel iCal commands");
+               CtdlRegisterSessionHook(ical_session_startup, EVT_START);
+               CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP);
+               CtdlRegisterFixedOutputHook("text/calendar", ical_fixed_output);
+               CtdlRegisterFixedOutputHook("application/ics", ical_fixed_output);
+               CtdlRegisterCleanupHook(serv_calendar_destroy);
+       }
+       
        /* return our Subversion id for the Log */
        return "$Id$";
 }
 
-
-
-void serv_calendar_destroy(void)
-{
-#ifdef CITADEL_WITH_CALENDAR_SERVICE
-       icaltimezone_free_builtin_timezones();
-#endif
-}