Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening...
[citadel.git] / webcit / availability.c
index 9a302b1aeceb766506b5f20c013f78a9c947846f..17edb3393f7068c7420e148224eb1928a1548f04 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1996-2012 by the citadel.org team
  *
@@ -34,14 +33,14 @@ icalcomponent *get_freebusy_for_user(char *who) {
        if (serialized_fb == NULL) {
                return NULL;
        }
-
+       
        fb = icalcomponent_new_from_string(ChrPtr(serialized_fb));
        FreeStrBuf(&serialized_fb);
        if (fb == NULL) {
                return NULL;
        }
 
-       return (fb);
+       return(fb);
 }
 
 
@@ -53,28 +52,30 @@ icalcomponent *get_freebusy_for_user(char *who) {
  *
  * Returns nonzero if they do overlap.
  */
-int ical_ctdl_is_overlap(struct icaltimetype t1start,
-                        struct icaltimetype t1end, struct icaltimetype t2start, struct icaltimetype t2end) {
+int ical_ctdl_is_overlap(
+                       struct icaltimetype t1start,
+                       struct icaltimetype t1end,
+                       struct icaltimetype t2start,
+                       struct icaltimetype t2end
+) {
 
-       if (icaltime_is_null_time(t1start))
-               return (0);
-       if (icaltime_is_null_time(t2start))
-               return (0);
+       if (icaltime_is_null_time(t1start)) return(0);
+       if (icaltime_is_null_time(t2start)) return(0);
 
        /* if either event lacks end time, assume end = start */
        if (icaltime_is_null_time(t1end))
                memcpy(&t1end, &t1start, sizeof(struct icaltimetype));
        else {
                if (t1end.is_date && icaltime_compare(t1start, t1end)) {
-                       /*
-                        * the end date is non-inclusive so adjust it by one
-                        * day because our test is inclusive, note that a day is
-                        * not too much because we are talking about all day
-                        * events
+                        /*
+                         * the end date is non-inclusive so adjust it by one
+                         * day because our test is inclusive, note that a day is
+                         * not too much because we are talking about all day
+                         * events
                         * if start = end we assume that nevertheless the whole
                         * day is meant
-                        */
-                       icaltime_adjust(&t1end, -1, 0, 0, 0);
+                         */
+                       icaltime_adjust(&t1end, -1, 0, 0, 0);   
                }
        }
 
@@ -82,42 +83,38 @@ int ical_ctdl_is_overlap(struct icaltimetype t1start,
                memcpy(&t2end, &t2start, sizeof(struct icaltimetype));
        else {
                if (t2end.is_date && icaltime_compare(t2start, t2end)) {
-                       icaltime_adjust(&t2end, -1, 0, 0, 0);
+                       icaltime_adjust(&t2end, -1, 0, 0, 0);   
                }
        }
 
        /* First, check for all-day events */
        if (t1start.is_date || t2start.is_date) {
                /* If event 1 ends before event 2 starts, we're in the clear. */
-               if (icaltime_compare_date_only(t1end, t2start) < 0)
-                       return (0);
+               if (icaltime_compare_date_only(t1end, t2start) < 0) return(0);
 
                /* If event 2 ends before event 1 starts, we're also ok. */
-               if (icaltime_compare_date_only(t2end, t1start) < 0)
-                       return (0);
+               if (icaltime_compare_date_only(t2end, t1start) < 0) return(0);
 
-               return (1);
+               return(1);
        }
 
        /* syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
-          t1start.hour, t1start.minute, t1end.hour, t1end.minute,
-          t2start.hour, t2start.minute, t2end.hour, t2end.minute);
-        */
+               t1start.hour, t1start.minute, t1end.hour, t1end.minute,
+               t2start.hour, t2start.minute, t2end.hour, t2end.minute);
+       */
 
        /* Now check for overlaps using date *and* time. */
 
        /* If event 1 ends before event 2 starts, we're in the clear. */
-       if (icaltime_compare(t1end, t2start) <= 0)
-               return (0);
+       if (icaltime_compare(t1end, t2start) <= 0) return(0);
        /* syslog(LOG_DEBUG, "first passed\n"); */
 
        /* If event 2 ends before event 1 starts, we're also ok. */
-       if (icaltime_compare(t2end, t1start) <= 0)
-               return (0);
+       if (icaltime_compare(t2end, t1start) <= 0) return(0);
        /* syslog(LOG_DEBUG, "second passed\n"); */
 
        /* Otherwise, they overlap. */
-       return (1);
+       return(1);
 }
 
 
@@ -135,7 +132,9 @@ int ical_ctdl_is_overlap(struct icaltimetype t1start,
  * The result is placed in 'annotation'.
  */
 void check_individual_attendee(char *attendee_string,
-                              struct icaltimetype event_start, struct icaltimetype event_end, char *annotation) {
+                               struct icaltimetype event_start,
+                               struct icaltimetype event_end,
+                               char *annotation) {
 
        icalcomponent *fbc = NULL;
        icalcomponent *fb = NULL;
@@ -170,11 +169,13 @@ void check_individual_attendee(char *attendee_string,
                strcpy(annotation, _("free"));
 
                for (thisfb = icalcomponent_get_first_property(fb, ICAL_FREEBUSY_PROPERTY);
-                    thisfb != NULL; thisfb = icalcomponent_get_next_property(fb, ICAL_FREEBUSY_PROPERTY)) {
+                   thisfb != NULL;
+                   thisfb = icalcomponent_get_next_property(fb, ICAL_FREEBUSY_PROPERTY) ) {
 
                        /** Do the check */
                        period = icalproperty_get_freebusy(thisfb);
-                       if (ical_ctdl_is_overlap(period.start, period.end, event_start, event_end)) {
+                       if (ical_ctdl_is_overlap(period.start, period.end,
+                          event_start, event_end)) {
                                strcpy(annotation, _("BUSY"));
                        }
 
@@ -193,7 +194,7 @@ void check_individual_attendee(char *attendee_string,
  *
  * vevent      the event which should be compared with attendees calendar
  */
-void check_attendee_availability(icalcomponent * vevent) {
+void check_attendee_availability(icalcomponent *vevent) {
        icalproperty *attendee = NULL;
        icalproperty *dtstart_p = NULL;
        icalproperty *dtend_p = NULL;
@@ -217,8 +218,11 @@ void check_attendee_availability(icalcomponent * vevent) {
         * new one.
         */
        if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
-               check_attendee_availability(icalcomponent_get_first_component(vevent, ICAL_VEVENT_COMPONENT)
-                   );
+               check_attendee_availability(
+                       icalcomponent_get_first_component(
+                               vevent, ICAL_VEVENT_COMPONENT
+                       )
+               );
                return;
        }
 
@@ -228,18 +232,17 @@ void check_attendee_availability(icalcomponent * vevent) {
         * Learn the start and end times.
         */
        dtstart_p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
-       if (dtstart_p != NULL)
-               dtstart_t = icalproperty_get_dtstart(dtstart_p);
+       if (dtstart_p != NULL) dtstart_t = icalproperty_get_dtstart(dtstart_p);
 
        dtend_p = icalcomponent_get_first_property(vevent, ICAL_DTEND_PROPERTY);
-       if (dtend_p != NULL)
-               dtend_t = icalproperty_get_dtend(dtend_p);
+       if (dtend_p != NULL) dtend_t = icalproperty_get_dtend(dtend_p);
 
        /*
         * Iterate through attendees.
         */
        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY);
-            attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+           attendee != NULL;
+           attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
                ch = icalproperty_get_attendee(attendee);
                if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
 
@@ -247,14 +250,17 @@ void check_attendee_availability(icalcomponent * vevent) {
                        safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
                        striplt(attendee_string);
 
-                       check_individual_attendee(attendee_string, dtstart_t, dtend_t, annotation);
+                       check_individual_attendee(attendee_string,
+                                               dtstart_t, dtend_t,
+                                               annotation);
 
                        /** Replace the attendee name with an annotated one. */
                        snprintf(annotated_attendee_string, sizeof annotated_attendee_string,
-                                "MAILTO:%s (%s)", attendee_string, annotation);
+                               "MAILTO:%s (%s)", attendee_string, annotation);
                        icalproperty_set_attendee(attendee, annotated_attendee_string);
 
                }
        }
 
 }
+