]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_listsub.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mk_module_init.sh now tests to see if echo supports -e and -E
[citadel.git] / citadel / serv_listsub.c
diff --git a/citadel/serv_listsub.c b/citadel/serv_listsub.c
index c838a97f759b876703ea655bd8c75d375852fc3a..93e93553b5a54c92618cb64125e6596b93baeced 100644 (file)
--- a/citadel/serv_listsub.c
+++ b/citadel/serv_listsub.c
@@ -35,11 +35,9 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -56,6 +54,10 @@
 #endif
 
 
+
+#include "ctdl_module.h"
+
+
 /*
  * Generate a randomizationalisticized token to use for authentication of
  * a subscribe or unsubscribe request.
@@ -106,7 +108,7 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
 
        listsub_generate_token(token);
 
-       assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &qrbuf, ctdl_netcfg_dir);
 
        /* 
         * Make sure the requested address isn't already subscribed
@@ -158,8 +160,29 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
        urlesc(urlroom, qrbuf.QRname);
 
        snprintf(confirmation_request, sizeof confirmation_request,
-               "Content-type: text/html\nMIME-Version: 1.0\n\n"
-               "<HTML><BODY>"
+
+               "MIME-Version: 1.0\n"
+               "Content-Type: multipart/alternative; boundary=\"__ctdlmultipart__\"\n"
+               "\n"
+               "This is a multipart message in MIME format.\n"
+               "\n"
+               "--__ctdlmultipart__\n"
+               "Content-type: text/plain\n"
+               "\n"
+               "Someone (probably you) has submitted a request to subscribe\n"
+               "<%s> to the '%s' mailing list.\n"
+               "\n"
+               "Please go here to confirm this request:\n"
+               "  %s?room=%s&token=%s&cmd=confirm  \n"
+               "\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"
+               "\n"
+               "--__ctdlmultipart__\n"
+               "Content-type: text/html\n"
+               "\n"
+               "<HTML><BODY>\n"
                "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"
@@ -168,7 +191,13 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
                "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",
+               "</BODY></HTML>\n"
+               "\n"
+               "--__ctdlmultipart__--\n",
+
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               qrbuf.QRname,
 
                email, qrbuf.QRname,
                webpage, urlroom, token,
@@ -178,6 +207,7 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
 
        quickie_message(        /* This delivers the message */
                "Citadel",
+               NULL,
                email,
                NULL,
                confirmation_request,
@@ -219,7 +249,7 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
 
        listsub_generate_token(token);
 
-       assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &qrbuf, ctdl_netcfg_dir);
 
        /* 
         * Make sure there's actually a subscription there to remove
@@ -270,19 +300,44 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
        urlesc(urlroom, qrbuf.QRname);
 
        snprintf(confirmation_request, sizeof confirmation_request,
-               "Content-type: text/html\nMIME-Version: 1.0\n\n"
-               "<HTML><BODY>"
-               "Someone (probably you) has submitted a request "
-               "to unsubscribe\n"
+
+               "MIME-Version: 1.0\n"
+               "Content-Type: multipart/alternative; boundary=\"__ctdlmultipart__\"\n"
+               "\n"
+               "This is a multipart message in MIME format.\n"
+               "\n"
+               "--__ctdlmultipart__\n"
+               "Content-type: text/plain\n"
+               "\n"
+               "Someone (probably you) has submitted a request to unsubscribe\n"
+               "<%s> from the '%s' mailing list.\n"
+               "\n"
+               "Please go here to confirm this request:\n"
+               "  %s?room=%s&token=%s&cmd=confirm  \n"
+               "\n"
+               "If this request has been submitted in error and you do not\n"
+               "wish to unsubscribe from the '%s' mailing list, simply do nothing,\n"
+               "and the request will not be processed.\n"
+               "\n"
+               "--__ctdlmultipart__\n"
+               "Content-type: text/html\n"
+               "\n"
+               "<HTML><BODY>\n"
+               "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=\"%s?room=%s&token=%s&cmd=confirm\">"
                "%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",
+               "If this request has been submitted in error and you do not\n"
+               "wish to unsubscribe from the '%s' mailing list, simply do nothing,\n"
+               "and the request will not be processed.\n"
+               "</BODY></HTML>\n"
+               "\n"
+               "--__ctdlmultipart__--\n",
+
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               qrbuf.QRname,
 
                email, qrbuf.QRname,
                webpage, urlroom, token,
@@ -292,6 +347,7 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
 
        quickie_message(        /* This delivers the message */
                "Citadel",
+               NULL,
                email,
                NULL,
                confirmation_request,
@@ -344,7 +400,7 @@ void do_confirm(char *room, char *token) {
         * Now start scanning this room's netconfig file for the
         * specified token.
         */
-       assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &qrbuf, ctdl_netcfg_dir);
        begin_critical_section(S_NETCONFIGS);
        ncfp = fopen(filename, "r+");
        if (ncfp != NULL) {
@@ -451,6 +507,7 @@ void do_confirm(char *room, char *token) {
         */
        if (success) {
                cprintf("%d %d operation(s) confirmed.\n", CIT_OK, success);
+               lprintf(CTDL_NOTICE, "Mailing list: %s %ssubscribed to %s with token %s\n", email, (strlen(address_to_unsubscribe) > 0) ? "un" : "", room, token);
        }
        else {
                cprintf("%d Invalid token.\n", ERROR + ILLEGAL_VALUE);
@@ -507,8 +564,10 @@ void cmd_subs(char *cmdbuf) {
 /*
  * Module entry point
  */
-char *serv_listsub_init(void)
+CTDL_MODULE_INIT(listsub)
 {
        CtdlRegisterProtoHook(cmd_subs, "SUBS", "List subscribe/unsubscribe");
+
+       /* return our Subversion id for the Log */
        return "$Id$";
 }
Citadel server, clients, utilities