From dc0a854bbf5942ee1c30498eac599a08452f37bb Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 24 Aug 2012 13:48:39 +0200 Subject: [PATCH] LISTSUSB: finalize templating. --- webcit/listsub.c | 220 +-------------------------- webcit/static/t/listsub/display.html | 76 ++++----- 2 files changed, 41 insertions(+), 255 deletions(-) diff --git a/webcit/listsub.c b/webcit/listsub.c index fe647cab3..11844203b 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -17,222 +17,6 @@ /* * List subscription handling */ -#ifndef EXPERIMENTAL_LISTSUB -void do_listsub(void) -{ - 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]; - - 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(); - - wc_printf("\n" - "\n" - "\n" - "\n" - ); - wc_printf(_("List subscription")); - wc_printf("\n"); - - strcpy(cmd, bstr("cmd")); - strcpy(room, bstr("room")); - strcpy(token, bstr("token")); - strcpy(email, bstr("email")); - strcpy(subtype, bstr("subtype")); - - wc_printf("
"); - wc_printf("
"); - - do_template("box_begin_1"); - StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0); - do_template("box_begin_2"); - wc_printf("

"); - - /* - * Subscribe command - */ - if (!strcasecmp(cmd, "subscribe")) { - serv_printf("SUBS subscribe|%s|%s|%s|%s/listsub", - room, - email, - subtype, - ChrPtr(site_prefix) - ); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - 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.

" - "Please click on the link which is being " - "e-mailed to you and your subscription will " - "be confirmed.
\n"), - escaped_email, escaped_room); - wc_printf("%s
\n", _("Go back...")); - } - else { - wc_printf("ERROR: %s" - "

\n", - &buf[4]); - goto FORM; - } - } - - /* - * Unsubscribe command - */ - else if (!strcasecmp(cmd, "unsubscribe")) { - serv_printf("SUBS unsubscribe|%s|%s|%s/listsub", - room, - email, - ChrPtr(site_prefix) - ); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - wc_printf("

Confirmation request sent

" - "You are unsubscribing "); - escputs(email); - wc_printf(" from the ""); - escputs(room); - 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.

" - "Please click on the link which is being " - "e-mailed to you and your unsubscription will " - "be confirmed.
\n" - "Back...
\n" - ); - } - else { - wc_printf("ERROR: %s" - "

\n", - &buf[4]); - goto FORM; - } - } - - /* - * Confirm command - */ - else if (!strcasecmp(cmd, "confirm")) { - serv_printf("SUBS confirm|%s|%s", - room, - token - ); - serv_getln(buf, sizeof buf); - if (buf[0] == '2') { - wc_printf("

Confirmation successful!

"); - } - else { - wc_printf("

Confirmation failed.

" - "This could mean one of two things:
    \n" - "
  • You waited too long to confirm your " - "subscribe/unsubscribe request (the " - "confirmation link is only valid for three " - "days)\n
  • You have already " - "successfully confirmed your " - "subscribe/unsubscribe request and are " - "attempting to do it again.
\n" - "The error returned by the server was: " - ); - } - wc_printf("%s

\n", &buf[4]); - } - - /* - * Any other (invalid) command causes the form to be displayed - */ - else { -FORM: wc_printf("
\n"); - - wc_printf("Name of list: " - "

\n"); - - wc_printf("Your e-mail address: " - "

\n"); - - wc_printf("(If subscribing) preferred format: " - "One message at a time  " - "Digest format  " - "

\n" - "\n" - "

\n" - "
\n" - ); - - 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" - ); - - } - - wc_printf("
"); - do_template("box_end"); - wc_printf("
"); - - wc_printf("\n"); - wDumpContent(0); - end_webcit_session(); -} -#endif int Conditional_LISTSUB_EXECUTE_SUBSCRIBE(StrBuf *Target, WCTemplputParams *TP) { @@ -343,18 +127,16 @@ int Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE(StrBuf *Target, WCTemplputPara return rc == 2; } -#ifdef EXPERIMENTAL_LISTSUB void do_listsub(void) { if (!havebstr("cmd")) { - putbstr("cmd", NewStrBufPlain(HKEY(""))); + putbstr("cmd", NewStrBufPlain(HKEY("choose"))); } output_headers(1, 0, 0, 0, 1, 0); do_template("listsub_display"); end_burst(); } -#endif void InitModule_LISTSUB diff --git a/webcit/static/t/listsub/display.html b/webcit/static/t/listsub/display.html index 5473bc82f..7568681cc 100644 --- a/webcit/static/t/listsub/display.html +++ b/webcit/static/t/listsub/display.html @@ -1,19 +1,23 @@ - - - - -<?_("List subscription")> - + + + + + + <?_("List subscription")> + + +
-
+

- + -
-

- +
+

+ @@ -22,18 +26,18 @@
-
+
-:

+:

- + - + -
-

+
+

- + "" @@ -42,28 +46,28 @@


-
+
-: +:

- + - + -

+

-

+

-
    -
    • -
  • already successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")>
    • -
+
    +
    • +
  • already successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")>
    • +
- +
@@ -73,17 +77,17 @@

- +

-  -  +  + 

- - + +

-
+
@@ -94,4 +98,4 @@
- + -- 2.30.2