From 179eb2be9a0322403c50f4a66ed73e5d317ca189 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 23 Aug 2002 03:37:19 +0000
Subject: [PATCH] * Finished all of the subscribe/unsubscribe/confirm stuff! 
 (I think)

---
 webcit/ChangeLog |  4 +++-
 webcit/floors.c  | 10 ++++++----
 webcit/listsub.c |  9 ++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 2a7feeee7..8a5c57042 100644
--- 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 1b9d36d41..48cca50f5 100644
--- 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 3f927a5b1..40b87a162 100644
--- 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\""
-- 
2.30.2