* Display conflicts nicely

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 1ea5587d049da5d70f952a9360f14049adf13a43..3758f0a85b6722a5456fe3a3acdaf4c9e4c37fb3 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 400.44  2002/10/21 20:16:38  ajc
+* Display conflicts nicely
+
 Revision 400.43  2002/10/21 18:29:14  ajc
 * Ask server to hunt for conflicts when displaying a meeting invitation
 
@@ -1087,4 +1090,3 @@ 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 843d3cc1766729cab7a0de4bb22db0e23c5a602f..549836a60e9bede7170cbda743512f401cf99665 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -83,10 +83,11 @@ void cal_process_object(icalcomponent *cal,
        struct icaltimetype t;
        time_t tt;
        char buf[SIZ];
+       char conflict_name[SIZ];
 
        /* Leading HTML for the display of this object */
        if (recursion_level == 0) {
-               wprintf("<CENTER><TABLE border=0 cellpadding=5>\n");
+               wprintf("<CENTER><TABLE border=0>\n");
        }
 
        /* Look for a method */
@@ -188,9 +189,16 @@ void cal_process_object(icalcomponent *cal,
                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");
+                               extract(conflict_name, buf, 3);
+                               wprintf("<TR><TD><B><I>CONFLICT:</I></B></TD>"
+                                       "<TD>"
+                                       "This event would conflict with "
+                                       "<I>&quot;"
+                               );
+                               escputs(conflict_name);
+                               wprintf("&quot;</I> "
+                                       "which is already in your calendar."
+                                       "</TD></TR>\n");
                        }
                }