X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fical_dezonify.c;h=de444a9d5522a791e5a56083c0195b9de0323dcf;hp=6c1fc9c069d27b7e385ac71b2c39dfc0b7545f1f;hb=5d2d3f4eea91c74af93c735bff7ad9955b466181;hpb=9f8e0bd23ce7dde31156b634f3a66bf234b11927

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 6c1fc9c06..de444a9d5 100644
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -1,4 +1,3 @@
-
 /* 
  * Function to go through an ical component set and convert all non-UTC
  * date/time properties to UTC.  It also strips out any VTIMEZONE
@@ -18,20 +17,20 @@
  */
 icaltimezone *get_default_icaltimezone(void) {
 
-	icaltimezone *zone = NULL;
+        icaltimezone *zone = NULL;
 	const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone);
 
-	if (!zone) {
-		zone = icaltimezone_get_builtin_timezone(default_zone_name);
-	}
-	if (!zone) {
+        if (!zone) {
+                zone = icaltimezone_get_builtin_timezone(default_zone_name);
+        }
+        if (!zone) {
 		syslog(LOG_WARNING, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
-		zone = icaltimezone_get_utc_timezone();
+                zone = icaltimezone_get_utc_timezone();
 	}
 	if (!zone) {
 		syslog(LOG_ERR, "Unable to load UTC time zone!\n");
 	}
-	return zone;
+        return zone;
 }
 
 
@@ -42,7 +41,9 @@ icaltimezone *get_default_icaltimezone(void) {
  * and the property (which will be a DTSTART, DTEND, etc.)
  * which we want to convert to UTC.
  */
-void ical_dezonify_backend(icalcomponent * cal, icalcomponent * rcal, icalproperty * prop) {
+void ical_dezonify_backend(icalcomponent *cal,
+			icalcomponent *rcal,
+			icalproperty *prop) {
 
 	icaltimezone *t = NULL;
 	icalparameter *param;
@@ -51,8 +52,7 @@ void ical_dezonify_backend(icalcomponent * cal, icalcomponent * rcal, icalproper
 	int utc_declared_as_tzid = 0;	/* Component declared 'TZID=GMT' instead of using Z syntax */
 
 	/* Give me nothing and I will give you nothing in return. */
-	if (cal == NULL)
-		return;
+	if (cal == NULL) return;
 
 	/* Hunt for a TZID parameter in this property. */
 	param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
@@ -66,7 +66,7 @@ void ical_dezonify_backend(icalcomponent * cal, icalcomponent * rcal, icalproper
 #ifdef DBG_ICAL
 			syslog(LOG_DEBUG, "                * Stringy supplied timezone is: '%s'\n", tzid);
 #endif
-			if ((!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT"))) {
+			if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
 				utc_declared_as_tzid = 1;
 #ifdef DBG_ICAL
 				syslog(LOG_DEBUG, "                * ...and we handle that internally.\n");
@@ -77,8 +77,8 @@ void ical_dezonify_backend(icalcomponent * cal, icalcomponent * rcal, icalproper
 				t = icalcomponent_get_timezone(cal, tzid);
 #ifdef DBG_ICAL
 				syslog(LOG_DEBUG, "                * ...and I %s have tzdata for that zone.\n",
-				       (t ? "DO" : "DO NOT")
-				    );
+					(t ? "DO" : "DO NOT")
+				);
 #endif
 				/* then try built-in timezones */
 				if (!t) {
@@ -173,16 +173,19 @@ void ical_dezonify_backend(icalcomponent * cal, icalcomponent * rcal, icalproper
 /*
  * Recursive portion of ical_dezonify()
  */
-void ical_dezonify_recurse(icalcomponent * cal, icalcomponent * rcal) {
+void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 	icalcomponent *c;
 	icalproperty *p;
 
 	/*
 	 * Recurse through all subcomponents *except* VTIMEZONE ones.
 	 */
-	for (c = icalcomponent_get_first_component(rcal, ICAL_ANY_COMPONENT);
-	     c != NULL; c = icalcomponent_get_next_component(rcal, ICAL_ANY_COMPONENT)
-	    ) {
+	for (c=icalcomponent_get_first_component(
+					rcal, ICAL_ANY_COMPONENT);
+		c != NULL;
+		c = icalcomponent_get_next_component(
+					rcal, ICAL_ANY_COMPONENT)
+	) {
 		if (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT) {
 			ical_dezonify_recurse(cal, c);
 		}
@@ -191,14 +194,16 @@ void ical_dezonify_recurse(icalcomponent * cal, icalcomponent * rcal) {
 	/*
 	 * Now look for DTSTART and DTEND properties
 	 */
-	for (p = icalcomponent_get_first_property(rcal, ICAL_ANY_PROPERTY);
-	     p != NULL; p = icalcomponent_get_next_property(rcal, ICAL_ANY_PROPERTY)
-	    ) {
-		if ((icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
-		    || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
-		    || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
-		    || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
-		    ) {
+	for (p=icalcomponent_get_first_property(rcal, ICAL_ANY_PROPERTY);
+		p != NULL;
+		p = icalcomponent_get_next_property(rcal, ICAL_ANY_PROPERTY)
+	) {
+		if (
+			(icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
+			|| (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
+			|| (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
+			|| (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
+		   ) {
 			ical_dezonify_backend(cal, rcal, p);
 		}
 	}
@@ -210,7 +215,7 @@ void ical_dezonify_recurse(icalcomponent * cal, icalcomponent * rcal) {
  * This function will search any VTIMEZONE subcomponents to learn the
  * relevant timezone information.
  */
-void ical_dezonify(icalcomponent * cal) {
+void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
 #ifdef DBG_ICAL
@@ -221,7 +226,8 @@ void ical_dezonify(icalcomponent * cal) {
 	ical_dezonify_recurse(cal, cal);
 
 	/* Strip out VTIMEZONE subcomponents -- we don't need them anymore */
-	while (vt = icalcomponent_get_first_component(cal, ICAL_VTIMEZONE_COMPONENT), vt != NULL) {
+	while (vt = icalcomponent_get_first_component(
+			cal, ICAL_VTIMEZONE_COMPONENT), vt != NULL) {
 		icalcomponent_remove_component(cal, vt);
 		icalcomponent_free(vt);
 	}
@@ -230,3 +236,4 @@ void ical_dezonify(icalcomponent * cal) {
 	syslog(LOG_DEBUG, "ical_dezonify() completed\n");
 #endif
 }
+