* Bugfixes and cosmetic changes to listsub system

[citadel.git] / citadel / serv_listsub.c
diff --git a/citadel/serv_listsub.c b/citadel/serv_listsub.c

index 4ee52e886afe3d390f32faa8c1c8dde58ffe9b05..7fdee6b0b133865253063d15c7ae2c7cc0ca8812 100644 (file)
--- a/citadel/serv_listsub.c
+++ b/citadel/serv_listsub.c
@@ -162,14 +162,18 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
                 "<HTML><BODY>"
                 "Someone (probably you) has submitted a request to subscribe\n"
                 "&lt;%s&gt; to the <B>%s</B> mailing list.<BR><BR>\n"
+               "Please click here to confirm this request:<BR>\n"
                 "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
-               "Please click here to confirm this request.</A><BR><BR>\n"
+               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
                 "If this request has been submitted in error and you do not\n"
                 "wish to receive the '%s' mailing list, simply do nothing,\n"
                 "and you will not receive any further mailings.\n"
                 "</BODY></HTML>\n",
  
-               email, qrbuf.QRname, webpage, urlroom, token, qrbuf.QRname
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               webpage, urlroom, token,
+               qrbuf.QRname
         );
  
         quickie_message(        /* This delivers the message */
@@ -177,7 +181,8 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
                 email,
                 NULL,
                 confirmation_request,
-               FMT_RFC822
+               FMT_RFC822,
+               "Please confirm your list subscription"
         );
  
         cprintf("%d Subscription entered; confirmation request sent\n", CIT_OK);
@@ -270,15 +275,19 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
                 "Someone (probably you) has submitted a request "
                 "to unsubscribe\n"
                 "&lt;%s&gt; from the <B>%s</B> mailing list.<BR><BR>\n"
+               "Please click here to confirm this request:<BR>\n"
                 "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
-               "Please click here to confirm this request.</A><BR><BR>\n"
+               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
                 "If this request has been submitted in error and you do\n"
                 "<i>not</i> wish to unsubscribe from the "
                 "'%s' mailing list, simply do nothing,\n"
                 "and you will remain subscribed to the list.\n"
                 "</BODY></HTML>\n",
  
-               email, qrbuf.QRname, webpage, urlroom, token, qrbuf.QRname
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               webpage, urlroom, token,
+               qrbuf.QRname
         );
  
         quickie_message(        /* This delivers the message */
@@ -286,7 +295,8 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
                 email,
                 NULL,
                 confirmation_request,
-               FMT_RFC822
+               FMT_RFC822,
+               "Please confirm your unsubscribe request"
         );
  
         cprintf("%d Unubscription noted; confirmation request sent\n", CIT_OK);
@@ -330,6 +340,10 @@ void do_confirm(char *room, char *token) {
                 return;
         }
  
+       /*
+        * Now start scanning this room's netconfig file for the
+        * specified token.
+        */
         assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
         begin_critical_section(S_NETCONFIGS);
         ncfp = fopen(filename, "r+");