X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fical_dezonify.c;h=c50f75621d3b491086a9846e45d5181c06f34f05;hb=86a1d535af8c52cc9536b03b707eed2d8674da31;hp=11609590855f0c3cd9ba62fb8e36cfa42372eb9c;hpb=8e067e48af470744ef660d45c2063e17b2c8af08;p=citadel.git

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 116095908..c50f75621 100644
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -1,13 +1,10 @@
 /* 
- * $Id$ 
- * 
  * Function to go through an ical component set and convert all non-UTC
  * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
  *
  * Everything here will work on both a fully encapsulated VCALENDAR component
  * or any type of subcomponent.
- *
  */
 
 #include "webcit.h"
@@ -21,17 +18,17 @@
 icaltimezone *get_default_icaltimezone(void) {
 
         icaltimezone *zone = NULL;
-	char *default_zone_name = serv_info.serv_default_cal_zone;
+	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) {
-		lprintf(1, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
+		syslog(1, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
                 zone = icaltimezone_get_utc_timezone();
 	}
 	if (!zone) {
-		lprintf(1, "Unable to load UTC time zone!\n");
+		syslog(1, "Unable to load UTC time zone!\n");
 	}
         return zone;
 }
@@ -67,19 +64,19 @@ void ical_dezonify_backend(icalcomponent *cal,
 		/* Convert it to an icaltimezone type. */
 		if (tzid != NULL) {
 #ifdef DBG_ICAL
-			lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+			syslog(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
 #endif
 			if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
 				utc_declared_as_tzid = 1;
 #ifdef DBG_ICAL
-				lprintf(9, "                * ...and we handle that internally.\n");
+				syslog(9, "                * ...and we handle that internally.\n");
 #endif
 			}
 			else {
 				/* try attached first */
 				t = icalcomponent_get_timezone(cal, tzid);
 #ifdef DBG_ICAL
-				lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+				syslog(9, "                * ...and I %s have tzdata for that zone.\n",
 					(t ? "DO" : "DO NOT")
 				);
 #endif
@@ -88,7 +85,7 @@ void ical_dezonify_backend(icalcomponent *cal,
 					t = icaltimezone_get_builtin_timezone(tzid);
 #ifdef DBG_ICAL
 					if (t) {
-						lprintf(9, "                * Using system tzdata!\n");
+						syslog(9, "                * Using system tzdata!\n");
 					}
 #endif
 				}
@@ -116,18 +113,18 @@ void ical_dezonify_backend(icalcomponent *cal,
 	}
 
 #ifdef DBG_ICAL
-	lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+	syslog(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
 #endif
 
 	if (TheTime.is_utc) {
 #ifdef DBG_ICAL
-		lprintf(9, "                * This property is ALREADY UTC.\n");
+		syslog(9, "                * This property is ALREADY UTC.\n");
 #endif
 	}
 
 	else if (utc_declared_as_tzid) {
 #ifdef DBG_ICAL
-		lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+		syslog(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
 #endif
 		TheTime.is_utc = 1;
 	}
@@ -136,12 +133,12 @@ void ical_dezonify_backend(icalcomponent *cal,
 		/* Do the conversion. */
 		if (t != NULL) {
 #ifdef DBG_ICAL
-			lprintf(9, "                * Timezone prop found.  Converting to UTC.\n");
+			syslog(9, "                * Timezone prop found.  Converting to UTC.\n");
 #endif
 		}
 		else {
 #ifdef DBG_ICAL
-			lprintf(9, "                * Converting default timezone to UTC.\n");
+			syslog(9, "                * Converting default timezone to UTC.\n");
 #endif
 		}
 
@@ -154,7 +151,7 @@ void ical_dezonify_backend(icalcomponent *cal,
 
 	icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 #ifdef DBG_ICAL
-	lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+	syslog(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
 #endif
 
 	/* Now add the converted property back in. */
@@ -222,7 +219,7 @@ void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
 #ifdef DBG_ICAL
-	lprintf(9, "ical_dezonify() started\n");
+	syslog(9, "ical_dezonify() started\n");
 #endif
 
 	/* Convert all times to UTC */
@@ -236,7 +233,7 @@ void ical_dezonify(icalcomponent *cal) {
 	}
 
 #ifdef DBG_ICAL
-	lprintf(9, "ical_dezonify() completed\n");
+	syslog(9, "ical_dezonify() completed\n");
 #endif
 }