X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Flistsub.c;h=fe647cab33e2fa7a339c65904d731b2896b67a09;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=0d70d08f9148d6a2f90884bbe38f8ef575b2b486;hpb=aa8ca3b0af3efdabd8559b886efb3164319bdce1;p=citadel.git diff --git a/webcit/listsub.c b/webcit/listsub.c index 0d70d08f9..fe647cab3 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -1,34 +1,52 @@ /* - * $Id$ - * * Web forms for handling mailing list subscribe/unsubscribe requests. * + * Copyright (c) 1996-2012 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "webcit.h" - - /* * List subscription handling */ +#ifndef EXPERIMENTAL_LISTSUB 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; char sroom[SIZ]; - strcpy(WC->wc_username, ""); - strcpy(WC->wc_password, ""); - strcpy(WC->wc_roomname, ""); + FlushStrBuf(WC->wc_fullname); + FlushStrBuf(WC->wc_username); + FlushStrBuf(WC->wc_password); + FlushStrBuf(WC->CurRoom.name); + + output_headers(1, 0, 0, 1, 1, 0); + begin_burst(); - wprintf("
" - " | \n" - "
");
+
+ do_template("box_begin_1");
+ StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0);
+ do_template("box_begin_2");
+ wc_printf(" "); /* * Subscribe command @@ -50,31 +70,34 @@ void do_listsub(void) room, email, subtype, - WC->http_host + ChrPtr(site_prefix) ); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf(" Confirmation request sent" - "You are subscribing "); - escputs(email); - wprintf(" to the ""); - escputs(room); - wprintf("" mailing list. The listserver has " + stresc(escaped_email, 256, email, 0, 0); + stresc(escaped_room, 256, room, 0, 0); + + wc_printf(""); + wc_printf(_("Confirmation request sent")); + wc_printf(""); + wc_printf(_("You are subscribing %s" + " to the %s 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 " "your protection, as it prevents others from " "being able to subscribe you to lists " - "without your consent." + "without your consent. " "Please click on the link which is being " "e-mailed to you and your subscription will " - "be confirmed. \n" - "Back... \n"), + escaped_email, escaped_room); + wc_printf("%s \n", + wc_printf("ERROR: %s" + " \n", &buf[4]); goto FORM; } @@ -87,37 +110,37 @@ void do_listsub(void) serv_printf("SUBS unsubscribe|%s|%s|%s/listsub", room, email, - WC->http_host + ChrPtr(site_prefix) ); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf(" Confirmation request sent" + wc_printf("Confirmation request sent" "You are unsubscribing "); escputs(email); - wprintf(" from the ""); + wc_printf(" from the ""); escputs(room); - wprintf("" mailing list. The listserver has " + wc_printf("" mailing list. The listserver has " "sent you an e-mail with one additional " "Web link for you to click on to confirm " "your unsubscription. This extra step is for " "your protection, as it prevents others from " "being able to unsubscribe you from " - "lists without your consent." + "lists without your consent. " "Please click on the link which is being " "e-mailed to you and your unsubscription will " - "be confirmed. \n" - "Back... \n" + "Back... \n", + wc_printf("ERROR: %s" + " \n", &buf[4]); goto FORM; } } - /* + /* * Confirm command */ else if (!strcasecmp(cmd, "confirm")) { @@ -127,10 +150,10 @@ void do_listsub(void) ); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf(" Confirmation successful!"); + wc_printf("Confirmation successful!"); } else { - wprintf("Confirmation failed." + wc_printf("Confirmation failed." "This could mean one of two things:
\n", &buf[4]); + wc_printf("%s \n", &buf[4]); } /* * Any other (invalid) command causes the form to be displayed */ else { -FORM: wprintf("\n" ); - wprintf(" When you attempt to subscribe or unsubscribe to " + wc_printf(" 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. \n" + "subscribe or unsubscribe you to lists. \n" ); } - /* - * Since this isn't part of a normal Citadel session, we bail right - * out without maintaining any state. - */ - /* wDumpContent(2); */ - wprintf("\n"); + wc_printf(" |