LISTSUSB: finalize templating.
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 24 Aug 2012 11:48:39 +0000 (13:48 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 24 Aug 2012 11:48:39 +0000 (13:48 +0200)
webcit/listsub.c
webcit/static/t/listsub/display.html

index fe647cab33e2fa7a339c65904d731b2896b67a09..11844203b703dd80ff7cf454aea22590c972bc9a 100644 (file)
 /*
  * 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("<HTML><HEAD>\n"
-               "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\" />\n"
-               "<link href=\"static/styles/webcit.css\" rel=\"stylesheet\" type=\"text/css\">\n"
-               "<TITLE>\n"
-       );
-       wc_printf(_("List subscription"));
-       wc_printf("</TITLE></HEAD><BODY>\n");
-
-       strcpy(cmd, bstr("cmd"));
-       strcpy(room, bstr("room"));
-       strcpy(token, bstr("token"));
-       strcpy(email, bstr("email"));
-       strcpy(subtype, bstr("subtype"));
-
-       wc_printf("<div align=center>");
-       wc_printf("<table border=0 width=75%%><tr><td>");
-
-       do_template("box_begin_1");
-       StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0);
-       do_template("box_begin_2");
-       wc_printf("<div align=center><br>");
-
-       /*
-        * 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("<CENTER><H1>");
-                       wc_printf(_("Confirmation request sent"));
-                       wc_printf("</H1>");
-                       wc_printf(_("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 "
-                               "your protection, as it prevents others from "
-                               "being able to subscribe you to lists "
-                               "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"),
-                               escaped_email, escaped_room);
-                       wc_printf("<a href=\"listsub\">%s</A></CENTER>\n", _("Go back..."));
-               }
-               else {
-                       wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><br><br>\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("<CENTER><H1>Confirmation request sent</H1>"
-                               "You are unsubscribing <TT>");
-                       escputs(email);
-                       wc_printf("</TT> from the &quot;");
-                       escputs(room);
-                       wc_printf("&quot; 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.<br><br>"
-                               "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"
-                       );
-               }
-               else {
-                       wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><br><br>\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("<CENTER><H1>Confirmation successful!</H1>");
-               }
-               else {
-                       wc_printf("<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: "
-                       );
-               }
-               wc_printf("%s</CENTER><br>\n", &buf[4]);
-       }
-
-       /*
-        * Any other (invalid) command causes the form to be displayed
-        */
-       else {
-FORM:          wc_printf("<form method=\"POST\" action=\"listsub\">\n");
-
-               wc_printf("Name of list: "
-                       "<select name=\"room\" size=1>\n");
-
-               serv_puts("LPRM");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       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) {
-                                       wc_printf("<option value=\"");
-                                       escputs(sroom);
-                                       wc_printf("\">");
-                                       escputs(sroom);
-                                       wc_printf("</option>\n");
-                               }
-                       }
-               }
-               wc_printf("</select><br><br>\n");
-
-               wc_printf("Your e-mail address: "
-                       "<INPUT TYPE=\"text\" NAME=\"email\" "
-                       "VALUE=\""
-               );
-               escputs(email);
-               wc_printf("\" maxlength=128 size=60><br><br>\n");
-
-               wc_printf("(If subscribing) preferred format: "
-                       "<INPUT TYPE=\"radio\" NAME=\"subtype\" "
-                       "VALUE=\"list\" CHECKED>One message at a time&nbsp; "
-                       "<INPUT TYPE=\"radio\" NAME=\"subtype\" "
-                       "VALUE=\"digest\">Digest format&nbsp; "
-                       "<br><br>\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"cmd\""
-                       " VALUE=\"subscribe\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"cmd\""
-                       " VALUE=\"unsubscribe\"><br><br>\n"
-                       "</FORM>\n"
-               );
-
-               wc_printf("<hr>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"
-               );
-
-       }
-
-       wc_printf("</div>");
-       do_template("box_end");
-       wc_printf("</td></tr></table></div>");
-
-       wc_printf("</BODY></HTML>\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
index 5473bc82f32ea5ebff218b9c025a9aaef3e1bba6..7568681cc7bc6111ea1d33bb46b32f2fe7b96322 100644 (file)
@@ -1,19 +1,23 @@
-<HTML><HEAD>
-<meta name="MSSmartTagsPreventParsing" content="TRUE" />
-<link href="static/styles/webcit.css" rel="stylesheet" type="text/css">
-<TITLE>
-<?_("List subscription")>
-</TITLE></HEAD><BODY>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta name="MSSmartTagsPreventParsing" content="TRUE" >
+  <link href="/static/styles/webcit.css" rel="stylesheet" type="text/css">
+  <title><?_("List subscription")></title>
+</head>
+<body>
+
 <div align=center>
-<table border=0 width=75%><tr><td>
+<table border=0 width='75%'><tr><td>
 <?=("box_begin_1")><?_("List subscribe/unsubscribe")><?=("box_begin_2")>
 <div align=center><br>
 
-<??("COND:BSTR", 10, "cmd", "subscribe")>
+<?!("COND:BSTR", 10, "cmd", "subscribe")>
 <?!("COND:LISTSUB:EXECUTE:SUBSCRIBE", 11)>
-<CENTER>
-<H1><?_("Confirmation request sent")></H1>
-<?_("You are subscribing ")><TT><?BSTR("email", "X")></TT>
+<center>
+<h1><?_("Confirmation request sent")></h1>
+<?_("You are subscribing ")><tt><?BSTR("email", "X")></tt>
 <?_(" to the ")><b><?BSTR("room", "X")></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.")>  
 <?_("Please click on the link which is being e-mailed to you and your subscription will be confirmed.")>
 <br>
 <a href="listsub"><?_("Go back...")></a>
-</CENTER>
+</center>
 <?!("X", 11)><??("COND:BSTR", 12, "__FAIL")>
-<FONT SIZE=+1><B><?_("ERROR")>: <?IMPORTANTMESSAGE></B></FONT><br><br>
+<font size=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font><br><br>
 <??("X", 12)>
-<??("X", 10)>
+<?!("X", 10)>
 
-<??("COND:BSTR", 20, "cmd", "unsubscribe")>
+<?!("COND:BSTR", 20, "cmd", "unsubscribe")>
 <?!("COND:LISTSUB:EXECUTE:UNSUBSCRIBE", 21)>
-<CENTER>
-<H1><?_("Confirmation request sent")></H1>
+<center>
+<h1><?_("Confirmation request sent")></h1>
 <?_("You are unsubscribing")> 
-<TT><?BSTR("email", "X")></TT
+<tt><?BSTR("email", "X")></tt
 <?_("from the")> 
 &quot;<?BSTR("room", "X")>&quot; 
 <?_("mailing list.")>
 <br><br>
 <?_("Please click on the link which is being e-mailed to you and your unsubscription will be confirmed.")><br>
 <a href="listsub"><?_("Back...")></a>
-</CENTER>
+</center>
 <?!("X", 21)><??("COND:BSTR", 22, "__FAIL")>
-<FONT SIZE=+1><B><?_("ERROR")>: <?IMPORTANTMESSAGE></B></FONT>
+<font SIZE=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font>
 <br><br>
 <?!("X", 22)>
-<??("X", 20)>
+<?!("X", 20)>
 
-<??("COND:BSTR", 30, "cmd", "confirm")>
+<?!("COND:BSTR", 30, "cmd", "confirm")>
 <?!("COND:LISTSUB:EXECUTE:CONFIRM:SUBSCRIBE", 31)>
-<CENTER><H1><?_("Confirmation successful!")></H1>
+<center><h1><?_("Confirmation successful!")></h1></center>
 <?!("X", 31)><??("COND:BSTR", 32, "__FAIL")>
-<CENTER><H1><?_("Confirmation failed.")></H1>
+<center><h1><?_("Confirmation failed.")></h1></center>
 <?_("This could mean one of two things:")>
-<UL>
-<LI><?_("You waited too long to confirm your subscribe/unsubscribe request (the confirmation link is only valid for three days)")></LI>
-<LI><?_("You have <i>already</i> successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")></li>
-</UL>
+<ul>
+<li><?_("You waited too long to confirm your subscribe/unsubscribe request (the confirmation link is only valid for three days)")></li>
+<li><?_("You have <i>already</i> successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")></li>
+</ul>
 <?_("The error returned by the server was: ")><?IMPORTANTMESSAGE>
 <??("X", 32)>
 <??("X", 30)>
 
-<??("COND:BSTR", 40, "cmd", "choose")>
+<?!("COND:BSTR", 40, "cmd", "choose")>
 
 <form method="POST" action="listsub">
 
 </select><br><br>
 
 <?_("Your e-mail address:")> 
-<INPUT TYPE="text" NAME="email" VALUE="<?BSTR('email', 'X')>" maxlength="128" size="60">
+<input type="text" name="email" value="<?BSTR('email', 'X')>" maxlength="128" size="60">
 <br><br>
 
 <?_("(If subscribing) preferred format: ")>
-<INPUT TYPE="radio" NAME="subtype" VALUE="list" CHECKED><?_("One message at a time")>&nbsp; 
-<INPUT TYPE="radio" NAME="subtype" VALUE="digest"><?_("Digest format")>&nbsp; 
+<input type="radio" name="subtype" value="list" CHECKED><?_("One message at a time")>&nbsp; 
+<input type="radio" name="subtype" value="digest"><?_("Digest format")>&nbsp; 
 <br><br>
-<INPUT TYPE="submit" NAME="cmd" VALUE="subscribe">
-<INPUT TYPE="submit" NAME="cmd" VALUE="unsubscribe">
+<input type="submit" name="cmd" value="subscribe">
+<input type="submit" name="cmd" value="unsubscribe">
 <br><br>
-</FORM>
+</form>
 
 <hr>
 <?_("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.")>
@@ -94,4 +98,4 @@
 <?=("box_end")>
 </td></tr></table></div>
 
-</BODY></HTML>
+</body></html>