projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lower case tags
[citadel.git] / webcit / listsub.c
diff --git a/webcit/listsub.c b/webcit/listsub.c
index c37a4836e8db631f56dd326354873775d34d0d4c..135644b3ebbbab622876f2f73c5c1505987fa9de 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -5,25 +5,6 @@
  *
  */
 
-#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>
 #include "webcit.h"
 
 
@@ -33,11 +14,13 @@
  */
 void do_listsub(void)
 {
-       char cmd[SIZ];
-       char room[SIZ];
-       char token[SIZ];
-       char email[SIZ];
-       char subtype[SIZ];
+       char cmd[256];
+       char room[256];
+       char token[256];
+       char email[256];
+       char subtype[256];
+       char escaped_email[256];
+       char escaped_room[256];
 
        char buf[SIZ];
        int self;
@@ -47,7 +30,9 @@ void do_listsub(void)
        strcpy(WC->wc_password, "");
        strcpy(WC->wc_roomname, "");
 
-       wprintf("<HTML><HEAD><TITLE>List subscription</TITLE></HEAD><BODY>\n");
+       wprintf("<HTML><HEAD><TITLE>");
+       wprintf(_("List subscription"));
+       wprintf("</TITLE></HEAD><BODY>\n");
 
        strcpy(cmd, bstr("cmd"));
        strcpy(room, bstr("room"));
@@ -57,28 +42,32 @@ void do_listsub(void)
 
        wprintf("<CENTER>"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">List subscribe/unsubscribe</SPAN>\n"
-               "</TD></TR></TABLE><br />\n"
-       );
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("List subscribe/unsubscribe"));
+       wprintf("</SPAN></TD></TR></TABLE><br />\n");
 
        /*
         * Subscribe command
         */
        if (!strcasecmp(cmd, "subscribe")) {
-               serv_printf("SUBS subscribe|%s|%s|%s|%s/listsub",
+               serv_printf("SUBS subscribe|%s|%s|%s|%s://%s/listsub",
                        room,
                        email,
                        subtype,
+                       (is_https ? "https" : "http"),
                        WC->http_host
                );
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       wprintf("<CENTER><H1>Confirmation request sent</H1>"
-                               "You are subscribing <TT>");
-                       escputs(email);
-                       wprintf("</TT> to the &quot;");
-                       escputs(room);
-                       wprintf("&quot; mailing list.  The listserver has "
+                       stresc(escaped_email, email, 0, 0);
+                       stresc(escaped_room, room, 0, 0);
+
+                       wprintf("<CENTER><H1>");
+                       wprintf(_("Confirmation request sent"));
+                       wprintf("</H1>");
+                       wprintf(_("You are subscribing <TT>%s"
+                               "</TT> to the <b>%s</b> mailing list.  "
+                               "The listserver has "
                                "sent you an e-mail with one additional "
                                "Web link for you to click on to confirm "
                                "your subscription.  This extra step is for "
@@ -87,9 +76,9 @@ void do_listsub(void)
                                "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"
-                               "<A HREF=\"/listsub\">Back...</A></CENTER>\n"
-                       );
+                               "be confirmed.<br />\n"),
+                               escaped_email, escaped_room);
+                       wprintf("<a href=\"/listsub\">%s</A></CENTER>\n", _("Go back..."));
                }
                else {
                        wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
@@ -103,9 +92,10 @@ void do_listsub(void)
         * Unsubscribe command
         */
        else if (!strcasecmp(cmd, "unsubscribe")) {
-               serv_printf("SUBS unsubscribe|%s|%s|%s/listsub",
+               serv_printf("SUBS unsubscribe|%s|%s|%s://%s/listsub",
                        room,
                        email,
+                       (is_https ? "https" : "http"),
                        WC->http_host
                );
                serv_getln(buf, sizeof buf);
@@ -125,7 +115,7 @@ void do_listsub(void)
                                "Please click on the link which is being "
                                "e-mailed to you and your unsubscription will "
                                "be confirmed.<br />\n"
-                               "<A HREF=\"/listsub\">Back...</A></CENTER>\n"
+                               "<a href=\"/listsub\">Back...</A></CENTER>\n"
                        );
                }
                else {
@@ -168,7 +158,7 @@ void do_listsub(void)
         * Any other (invalid) command causes the form to be displayed
         */
        else {
-FORM:          wprintf("<FORM METHOD=\"POST\" ACTION=\"/listsub\">\n"
+FORM:          wprintf("<FORM METHOD=\"POST\" action=\"/listsub\">\n"
                        "<TABLE BORDER=0>\n"
                );
 
Citadel server, clients, utilities