encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_CRIT, "Error at %s:%d - could not allocate component!\n",
- __FILE__, __LINE__);
+ CtdlLogPrintf(CTDL_CRIT, "ERROR: could not allocate component!\n");
return NULL;
}
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Error at %s:%d - could not allocate component!\n",
- __FILE__, __LINE__);
+ CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n");
cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR);
return;
}
);
ser = icalcomponent_as_ical_string_r(encaps);
+ icalcomponent_free(encaps); /* Don't need this anymore. */
client_write(ser, strlen(ser));
free(ser);
cprintf("\n000\n");
- icalcomponent_free(encaps); /* Don't need this anymore. */
-
}
icalproperty *summary = NULL;
size_t reqsize;
icalproperty *p;
+ struct icaltimetype t;
+ icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
+ int i;
+ icaltimezone *z;
+ int num_zones_attached = 0;
+ int zone_already_attached;
if (cal == NULL) {
CtdlLogPrintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "Error at %s:%d - could not allocate component!\n",
- __FILE__, __LINE__);
+ CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n");
icalcomponent_free(the_request);
return;
}
/* Set the method to REQUEST */
icalcomponent_set_method(encaps, ICAL_METHOD_REQUEST);
- /* FIXME: attach time zones here */
+ /* Look for properties containing timezone parameters, to see if we need to attach VTIMEZONEs */
for (p = icalcomponent_get_first_property(the_request, ICAL_ANY_PROPERTY);
p != NULL;
p = icalcomponent_get_next_property(the_request, ICAL_ANY_PROPERTY))
|| (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY)
|| (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
) {
- CtdlLogPrintf(CTDL_DEBUG, "FIXME: found a property that requires a vtimezone\n");
+ t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
+ CtdlLogPrintf(CTDL_DEBUG, "Found an icaltimetype: %s\n",
+ icaltime_as_ical_string(t)
+ );
+
+ /* First see if there's a timezone attached to the data structure itself */
+ if (icaltime_is_utc(t)) {
+ z = icaltimezone_get_utc_timezone();
+ }
+ else {
+ z = icaltime_get_timezone(t);
+ }
+ if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone is present in data structure\n");
+
+ /* If not, try to determine the tzid from the parameter using attached zones */
+ if (!z) {
+ z = icalcomponent_get_timezone(top_level_cal,
+ icalparameter_get_tzid(
+ icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
+ )
+ );
+ if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in attached zones\n");
+ }
+
+ /* Still no good? Try our internal database */
+ if (!z) {
+ z = icaltimezone_get_builtin_timezone_from_tzid(
+ icalparameter_get_tzid(
+ icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
+ )
+ );
+ if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in internal db\n");
+ }
+
+ if (z) {
+ CtdlLogPrintf(CTDL_DEBUG, "Have valid timezone, need to attach it.\n");
+
+ zone_already_attached = 0;
+ for (i=0; i<5; ++i) {
+ if (z == attached_zones[i]) {
+ ++zone_already_attached;
+ CtdlLogPrintf(CTDL_DEBUG, "zone already attached!!\n");
+ }
+ }
+ if ((!zone_already_attached) && (num_zones_attached < 5)) {
+ CtdlLogPrintf(CTDL_DEBUG, "attach zone %d\n", num_zones_attached);
+ attached_zones[num_zones_attached++] = z;
+ }
+
+ icalproperty_set_parameter(p,
+ icalparameter_new_tzid(icaltimezone_get_tzid(z))
+ );
+ }
}
}
- /* Here we go: put the VEVENT into the VCALENDAR. We now no longer
+ /* Encapsulate any timezones we need */
+ if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
+ icalcomponent *zc;
+ zc = icalcomponent_new_clone(icaltimezone_get_component(attached_zones[i]));
+ icalcomponent_add_component(encaps, zc);
+ }
+
+ /* Here we go: encapsulate the VEVENT into the VCALENDAR. We now no longer
* are responsible for "the_request"'s memory -- it will be freed
* when we free "encaps".
*/
/* return our Subversion id for the Log */
return "$Id$";
}
-
-
-
-
-
-
-
-
-/* FIXME I just saved this down here so I can steal code from it */
-
-#if 0
-
-icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
- icalcomponent *encaps;
- icalproperty *p;
- struct icaltimetype t;
- const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
- int i;
- const icaltimezone *z;
- int num_zones_attached = 0;
- int zone_already_attached;
-
- if (subcomp == NULL) {
- lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
- return NULL;
- }
-
- /*
- * If we're already looking at a full VCALENDAR component, this is probably an error.
- */
- if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
- lprintf(3, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
- return subcomp;
- }
-
- /* search for... */
- for (p = icalcomponent_get_first_property(subcomp, ICAL_ANY_PROPERTY);
- p != NULL;
- p = icalcomponent_get_next_property(subcomp, ICAL_ANY_PROPERTY))
- {
- if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY)
- || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
- || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
- || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
- || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY)
- || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY)
- || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY)
- || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
- ) {
- t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
- if ((icaltime_is_valid_time(t)) && (z=icaltime_get_timezone(t), z)) {
-
- zone_already_attached = 0;
- for (i=0; i<5; ++i) {
- if (z == attached_zones[i]) {
- ++zone_already_attached;
- lprintf(9, "zone already attached!!\n");
- }
- }
- if ((!zone_already_attached) && (num_zones_attached < 5)) {
- lprintf(9, "attaching zone %d!\n", num_zones_attached);
- attached_zones[num_zones_attached++] = z;
- }
-
- icalproperty_set_parameter(p,
- icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z))
- );
- }
- }
- }
-
- /* Encapsulate the VEVENT component into a complete VCALENDAR */
- encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
- if (encaps == NULL) {
- lprintf(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
- return NULL;
- }
-
- /* Set the Product ID */
- icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID));
-
- /* Set the Version Number */
- icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
-
- /* Attach any timezones we need */
- if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
- icalcomponent *zc;
- zc = icalcomponent_new_clone(icaltimezone_get_component((icaltimezone *)attached_zones[i]));
- icalcomponent_add_component(encaps, zc);
- }
-
- /* Encapsulate the subcomponent inside */
- icalcomponent_add_component(encaps, subcomp);
-
- /* Return the object we just created. */
- return(encaps);
-}
-
-#endif
projects / citadel.git / blobdiff