* Ask server to hunt for conflicts when displaying a meeting invitation

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index d4d3e12acc42b98e6aa593369c144854ba78efd7..1ea5587d049da5d70f952a9360f14049adf13a43 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 400.43  2002/10/21 18:29:14  ajc
+* Ask server to hunt for conflicts when displaying a meeting invitation
+
 Revision 400.42  2002/10/19 21:28:32  ajc
 * Moved the calendar meeting request reply functionality to the Citadel server
 
@@ -1084,3 +1087,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 2cdab8f77cd9a710dda8d6a8ceaa0d9c98724cd4..843d3cc1766729cab7a0de4bb22db0e23c5a602f 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -180,8 +180,21 @@ void cal_process_object(icalcomponent *cal,
                cal_process_object(c, recursion_level+1, msgnum, cal_partnum);
        }
 
-       /* If this is a REQUEST, display the Accept/Decline buttons */
+       /* If this is a REQUEST, display conflicts and buttons */
        if (the_method == ICAL_METHOD_REQUEST) {
+
+               /* Check for conflicts */
+               serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
+               serv_gets(buf);
+               if (buf[0] == '1') {
+                       while (serv_gets(buf), strcmp(buf, "000")) {
+                       wprintf("<TR><TD><B><I>CONFLICT:</I></B></TD><TD>");
+                       escputs(buf);
+                       wprintf("</TD></TR>\n");
+                       }
+               }
+
+               /* Display the Accept/Decline buttons */
                wprintf("<TR><TD COLSPAN=2>"
                        "<FORM METHOD=\"GET\" "
                        "ACTION=\"/respond_to_request\">\n"
@@ -201,11 +214,13 @@ void cal_process_object(icalcomponent *cal,
                        "</TD></TR>\n",
                        msgnum, cal_partnum
                );
+
        }
 
        /* Trailing HTML for the display of this object */
        if (recursion_level == 0) {
-               wprintf("</TD></TR></TABLE></CENTER>\n");
+
+               wprintf("</TR></TABLE></CENTER>\n");
        }
 }