* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / listsub.c

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 40b87a162e6a020e108519a9f4d3fc58b666f587..0d70d08f9148d6a2f90884bbe38f8ef575b2b486 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -1,22 +1,10 @@
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
+/*
+ * $Id$
+ *
+ * Web forms for handling mailing list subscribe/unsubscribe requests.
+ *
+ */
+
 #include "webcit.h"
 
 
@@ -49,10 +37,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 +52,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,15 +65,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></CENTER>\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;
                }
@@ -101,7 +89,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>");
@@ -114,15 +102,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></CENTER>\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;
                }
@@ -136,14 +125,24 @@ void do_listsub(void)
                        room,
                        token
                );
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        wprintf("<CENTER><H1>Confirmation successful!</H1>");
                }
                else {
-                       wprintf("<CENTER><H1>Confirmation failed.</H1>");
+                       wprintf("<CENTER><H1>Confirmation failed.</H1>"
+                               "This could mean one of two things:<UL>\n"
+                               "<LI>You waited too long to confirm your "
+                               "subscribe/unsubscribe request (the "
+                               "confirmation link is only valid for three "
+                               "days)\n<LI>You have <i>already</i> "
+                               "successfully confirmed your "
+                               "subscribe/unsubscribe request and are "
+                               "attempting to do it again.</UL>\n"
+                               "The error returned by the server was: "
+                       );
                }
-               wprintf("%s</CENTER><BR>\n", &buf[4]);
+               wprintf("%s</CENTER><br />\n", &buf[4]);
        }
 
        /*
@@ -158,10 +157,10 @@ FORM:             wprintf("<FORM METHOD=\"POST\" 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=\"");
@@ -188,7 +187,7 @@ FORM:               wprintf("<FORM METHOD=\"POST\" 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\""
@@ -196,12 +195,12 @@ FORM:             wprintf("<FORM METHOD=\"POST\" 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"
                );
 
        }