* Finished all of the subscribe/unsubscribe/confirm stuff! (I think)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 2a7feeee7611bfaeabfcd6dc036c4e1893d25c2c..8a5c570422133f74d29b4065a44e87fa29363a7e 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 323.62  2002/08/23 03:37:19  ajc
+* Finished all of the subscribe/unsubscribe/confirm stuff!  (I think)
+
 Revision 323.61  2002/08/22 03:55:47  ajc
 * 'unsubscribe' command (but not 'confirm unsubscribe')
 
@@ -910,4 +913,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/floors.c b/webcit/floors.c
index 1b9d36d41cb0431f77e67bce9e083d3a667520d3..48cca50f51fd88a7cf00154a4594b52871eccfc5 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -79,11 +79,13 @@ void display_floorconfig(char *prepend_html)
                        wprintf("</TD><TD>"
                                "<A HREF=\"/delete_floor?floornum=%d\">"
                                "<FONT SIZE=-1>(delete floor)</A>"
-                               "</FONT><BR><FONT SIZE=-1>"
-                               "<A HREF=\"/display_editfloorpic&"
-                               "which_floor=%d\">(edit graphic)</A>",
-                               floornum, floornum);
+                               "</FONT><BR>", floornum
+                       );
                }
+               wprintf("<FONT SIZE=-1>"
+                       "<A HREF=\"/display_editfloorpic&"
+                       "which_floor=%d\">(edit graphic)</A>",
+                       floornum);
                wprintf("</TD></TR></TABLE>");
                wprintf("</TD>");
 

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 3f927a5b178e11df9a64f38587c6c1b4f6ecf021..40b87a162e6a020e108519a9f4d3fc58b666f587 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -59,9 +59,10 @@ void do_listsub(void)
         * Subscribe command
         */
        if (!strcasecmp(cmd, "subscribe")) {
-               serv_printf("SUBS subscribe|%s|%s|digest|%s/listsub",
+               serv_printf("SUBS subscribe|%s|%s|%s|%s/listsub",
                        room,
                        email,
+                       subtype,
                        WC->http_host
                );
                serv_gets(buf);
@@ -182,6 +183,12 @@ FORM:              wprintf("<FORM METHOD=\"POST\" ACTION=\"/listsub\">\n"
                wprintf("\" MAXLENGTH=128></TD></TR>\n");
 
                wprintf("</TABLE>"
+                       "(If subscribing) preferred format: "
+                       "<INPUT TYPE=\"radio\" NAME=\"subtype\""
+                       "VALUE=\"list\">One message at a time&nbsp; "
+                       "<INPUT TYPE=\"radio\" NAME=\"subtype\""
+                       "VALUE=\"digest\" CHECKED>Digest format&nbsp; "
+                       "<BR>\n"
                        "<INPUT TYPE=\"submit\" NAME=\"cmd\""
                        " VALUE=\"subscribe\">\n"
                        "<INPUT TYPE=\"submit\" NAME=\"cmd\""