* Separate event invitees with newlines instead of commas.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 433a9e7b190540d971bca5936128afd9f665b250..8a0ccb73c38a42dfd6abd0ddda94a315919d643f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.32  2003/05/20 03:25:41  ajc
+* Separate event invitees with newlines instead of commas.
+
 Revision 410.31  2003/05/19 19:55:09  ajc
 * summary.c: eliminate compiler warnings about unused variables when
   compiling a WebCit service without calendar support
@@ -1404,4 +1407,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_tools.c b/webcit/calendar_tools.c
index f832bb5b08b628bb803c08f81540802f09990096..e276cf3937fa6dd3e1a439975924a1a1cf35925f 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -169,7 +169,7 @@ struct icaltimetype icaltime_from_webform(char *prefix) {
 
 
 /*
- * Generae a new, globally unique UID parameter for a calendar object.
+ * Generate a new, globally unique UID parameter for a calendar object.
  */
 void generate_new_uid(char *buf) {
        static int seq = 0;

diff --git a/webcit/event.c b/webcit/event.c
index d8656ebdb1f7d01546f639064782b0b1e8507b28..e8521d67dd30c22efa2d13ba97b45963b078e21a 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -87,11 +87,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /* Begin output */
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
-               "<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
-               "<SPAN CLASS=\"titlebar\">Edit event</SPAN>"
-               "</TD></TR></TABLE><BR>\n"
-       );
+       do_template("beginbox_nt");
+       wprintf("<h3>&nbsp;<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
+               "&nbsp;Add or edit an event</h3>\n");
 
        /************************************************************
         * Uncomment this to see the UID in calendar events for debugging
@@ -238,7 +236,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        wprintf("<TR><TD><B>Notes</B></TD><TD>\n"
                "<TEXTAREA NAME=\"description\" wrap=soft "
-               "ROWS=10 COLS=80 WIDTH=80>\n"
+               "ROWS=5 COLS=80 WIDTH=80>\n"
        );
        p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
@@ -328,7 +326,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /* Attendees */
        wprintf("<TR><TD><B>Attendees</B><BR>"
-               "<FONT SIZE=-2>(Separate multiple attendees with commas)"
+               "<FONT SIZE=-2>(One per line)"
                "</FONT></TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" wrap=soft "
                "ROWS=3 COLS=80 WIDTH=80>\n",
@@ -342,7 +340,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                        /* screen name or email address */
                        strcpy(attendee_string, &attendee_string[7]);
                        striplt(attendee_string);
-                       if (i++) wprintf(", ");
+                       if (i++) wprintf("\n");
                        escputs(attendee_string);
                        wprintf(" ");
 
@@ -394,6 +392,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                </SCRIPT>
        ");
 
+       do_template("endbox");
        wDumpContent(1);
 
        if (created_new_vevent) {
@@ -603,8 +602,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                stripout(form_attendees, '(', ')');
 
                /* Now iterate! */
-               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
-                       extract_token(buf, form_attendees, i, ',');
+               for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+                       extract_token(buf, form_attendees, i, '\n');
                        striplt(buf);
                        if (strlen(buf) > 0) {
                                lprintf(9, "Attendee: <%s>\n", buf);
@@ -636,8 +635,8 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
                                strcpy(attendee_string, &attendee_string[7]);
                                striplt(attendee_string);
                                foundit = 0;
-                               for (i=0; i<num_tokens(form_attendees, ','); ++i) {
-                                       extract_token(buf, form_attendees, i, ',');
+                               for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
+                                       extract_token(buf, form_attendees, i, '\n');
                                        striplt(buf);
                                        if (!strcasecmp(buf, attendee_string)) ++foundit;
                                }