* Removed the last couple of places where forms were submitted using

[citadel.git] / webcit / listsub.c

diff --git a/webcit/listsub.c b/webcit/listsub.c
index b94279530e5f568124e75decbd4f6b5282a4fbc3..c37a4836e8db631f56dd326354873775d34d0d4c 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -1,3 +1,10 @@
+/*
+ * $Id$
+ *
+ * Web forms for handling mailing list subscribe/unsubscribe requests.
+ *
+ */
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -49,10 +56,9 @@ void do_listsub(void)
        strcpy(subtype, bstr("subtype"));
 
        wprintf("<CENTER>"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>List subscribe/unsubscribe</B>\n"
-               "</TD></TR></TABLE><BR>\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">List subscribe/unsubscribe</SPAN>\n"
+               "</TD></TR></TABLE><br />\n"
        );
 
        /*
@@ -65,7 +71,7 @@ void do_listsub(void)
                        subtype,
                        WC->http_host
                );
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        wprintf("<CENTER><H1>Confirmation request sent</H1>"
                                "You are subscribing <TT>");
@@ -78,16 +84,16 @@ void do_listsub(void)
                                "your subscription.  This extra step is for "
                                "your protection, as it prevents others from "
                                "being able to subscribe you to lists "
-                               "without your consent.<BR><BR>"
+                               "without your consent.<br /><br />"
                                "Please click on the link which is being "
                                "e-mailed to you and your subscription will "
-                               "be confirmed.<BR>\n"
+                               "be confirmed.<br />\n"
                                "<A HREF=\"/listsub\">Back...</A></CENTER>\n"
                        );
                }
                else {
                        wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><BR><BR>\n",
+                               "</FONT><br /><br />\n",
                                &buf[4]);
                        goto FORM;
                }
@@ -102,7 +108,7 @@ void do_listsub(void)
                        email,
                        WC->http_host
                );
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        wprintf("<CENTER><H1>Confirmation request sent</H1>"
                                "You are unsubscribing <TT>");
@@ -115,16 +121,16 @@ void do_listsub(void)
                                "your unsubscription.  This extra step is for "
                                "your protection, as it prevents others from "
                                "being able to unsubscribe you from "
-                               "lists without your consent.<BR><BR>"
+                               "lists without your consent.<br /><br />"
                                "Please click on the link which is being "
                                "e-mailed to you and your unsubscription will "
-                               "be confirmed.<BR>\n"
+                               "be confirmed.<br />\n"
                                "<A HREF=\"/listsub\">Back...</A></CENTER>\n"
                        );
                }
                else {
                        wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><BR><BR>\n",
+                               "</FONT><br /><br />\n",
                                &buf[4]);
                        goto FORM;
                }
@@ -138,7 +144,7 @@ void do_listsub(void)
                        room,
                        token
                );
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        wprintf("<CENTER><H1>Confirmation successful!</H1>");
                }
@@ -155,14 +161,14 @@ void do_listsub(void)
                                "The error returned by the server was: "
                        );
                }
-               wprintf("%s</CENTER><BR>\n", &buf[4]);
+               wprintf("%s</CENTER><br />\n", &buf[4]);
        }
 
        /*
         * Any other (invalid) command causes the form to be displayed
         */
        else {
-FORM:          wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
+FORM:          wprintf("<FORM METHOD=\"POST\" ACTION=\"/listsub\">\n"
                        "<TABLE BORDER=0>\n"
                );
 
@@ -170,10 +176,10 @@ FORM:             wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
                        "<SELECT NAME=\"room\" SIZE=1>\n");
 
                serv_puts("LPRM");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '1') {
-                       while (serv_gets(buf), strcmp(buf, "000")) {
-                               extract(sroom, buf, 0);
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               extract_token(sroom, buf, 0, '|', sizeof sroom);
                                self = extract_int(buf, 4) & QR2_SELFLIST ;
                                if (self) {
                                        wprintf("<OPTION VALUE=\"");
@@ -200,7 +206,7 @@ FORM:               wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
                        "VALUE=\"list\">One message at a time&nbsp; "
                        "<INPUT TYPE=\"radio\" NAME=\"subtype\""
                        "VALUE=\"digest\" CHECKED>Digest format&nbsp; "
-                       "<BR>\n"
+                       "<br />\n"
                        "<INPUT TYPE=\"submit\" NAME=\"cmd\""
                        " VALUE=\"subscribe\">\n"
                        "<INPUT TYPE=\"submit\" NAME=\"cmd\""
@@ -208,12 +214,12 @@ FORM:             wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
                        "</FORM>\n"
                );
 
-               wprintf("<BR>When you attempt to subscribe or unsubscribe to "
+               wprintf("<br />When you attempt to subscribe or unsubscribe to "
                        "a mailing list, you will receive an e-mail containing"
                        " one additional web link to click on for final "
                        "confirmation.  This extra step is for your "
                        "protection, as it prevents others from being able to "
-                       "subscribe or unsubscribe you to lists.<BR>\n"
+                       "subscribe or unsubscribe you to lists.<br />\n"
                );
 
        }