*
* This module handles self-service subscription/unsubscription to mail lists.
*
- * Copyright (C) 2002 by Art Cancro and others.
+ * Copyright (C) 2002-2005 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
*/
void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
struct ctdlroom qrbuf;
FILE *ncfp;
- char filename[SIZ];
- char token[SIZ];
- char confirmation_request[SIZ];
- char buf[SIZ];
- char urlroom[SIZ];
- char scancmd[SIZ];
- char scanemail[SIZ];
+ char filename[256];
+ char token[256];
+ char confirmation_request[2048];
+ char buf[512];
+ char urlroom[ROOMNAMELEN];
+ char scancmd[64];
+ char scanemail[256];
int found_sub = 0;
if (getroom(&qrbuf, room) != 0) {
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
if (ncfp != NULL) {
while (fgets(buf, sizeof buf, ncfp) != NULL) {
buf[strlen(buf)-1] = 0;
- extract(scancmd, buf, 0);
- extract(scanemail, buf, 1);
+ extract_token(scancmd, buf, 0, '|', sizeof scancmd);
+ extract_token(scanemail, buf, 1, '|', sizeof scanemail);
if ((!strcasecmp(scancmd, "listrecp"))
|| (!strcasecmp(scancmd, "digestrecp"))) {
if (!strcasecmp(scanemail, email)) {
urlesc(urlroom, qrbuf.QRname);
snprintf(confirmation_request, sizeof confirmation_request,
- "Content-type: text/html\n\n"
+ "Content-type: text/html\nMIME-Version: 1.0\n\n"
"<HTML><BODY>"
"Someone (probably you) has submitted a request to subscribe\n"
"<%s> 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\">"
- "http://%s?room=%s&token=%s&cmd=confirm</A><BR><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 not\n"
"wish to receive the '%s' mailing list, simply do nothing,\n"
"and you will not receive any further mailings.\n"
void do_unsubscribe(char *room, char *email, char *webpage) {
struct ctdlroom qrbuf;
FILE *ncfp;
- char filename[SIZ];
- char token[SIZ];
- char buf[SIZ];
- char confirmation_request[SIZ];
- char urlroom[SIZ];
- char scancmd[SIZ];
- char scanemail[SIZ];
+ char filename[256];
+ char token[256];
+ char buf[512];
+ char confirmation_request[2048];
+ char urlroom[ROOMNAMELEN];
+ char scancmd[256];
+ char scanemail[256];
int found_sub = 0;
if (getroom(&qrbuf, room) != 0) {
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
if (ncfp != NULL) {
while (fgets(buf, sizeof buf, ncfp) != NULL) {
buf[strlen(buf)-1] = 0;
- extract(scancmd, buf, 0);
- extract(scanemail, buf, 1);
+ extract_token(scancmd, buf, 0, '|', sizeof scancmd);
+ extract_token(scanemail, buf, 1, '|', sizeof scanemail);
if ((!strcasecmp(scancmd, "listrecp"))
|| (!strcasecmp(scancmd, "digestrecp"))) {
if (!strcasecmp(scanemail, email)) {
urlesc(urlroom, qrbuf.QRname);
snprintf(confirmation_request, sizeof confirmation_request,
- "Content-type: text/html\n\n"
+ "Content-type: text/html\nMIME-Version: 1.0\n\n"
"<HTML><BODY>"
"Someone (probably you) has submitted a request "
"to unsubscribe\n"
"<%s> 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\">"
- "http://%s?room=%s&token=%s&cmd=confirm</A><BR><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"
void do_confirm(char *room, char *token) {
struct ctdlroom qrbuf;
FILE *ncfp;
- char filename[SIZ];
- char line_token[SIZ];
+ char filename[256];
+ char line_token[256];
long line_offset;
int line_length;
- char buf[SIZ];
- char cmd[SIZ];
- char email[SIZ];
- char subtype[SIZ];
+ char buf[512];
+ char cmd[256];
+ char email[256];
+ char subtype[128];
int success = 0;
- char address_to_unsubscribe[SIZ];
- char scancmd[SIZ];
- char scanemail[SIZ];
+ char address_to_unsubscribe[256];
+ char scancmd[256];
+ char scanemail[256];
char *holdbuf = NULL;
int linelen = 0;
int buflen = 0;
* 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) {
(fgets(buf, sizeof buf, ncfp) != NULL) ) {
buf[strlen(buf)-1] = 0;
line_length = strlen(buf);
- extract(cmd, buf, 0);
+ extract_token(cmd, buf, 0, '|', sizeof cmd);
if (!strcasecmp(cmd, "subpending")) {
- extract(email, buf, 1);
- extract(subtype, buf, 2);
- extract(line_token, buf, 3);
+ extract_token(email, buf, 1, '|', sizeof email);
+ extract_token(subtype, buf, 2, '|', sizeof subtype);
+ extract_token(line_token, buf, 3, '|', sizeof line_token);
if (!strcasecmp(token, line_token)) {
if (!strcasecmp(subtype, "digest")) {
- strcpy(buf, "digestrecp|");
+ safestrncpy(buf, "digestrecp|", sizeof buf);
}
else {
- strcpy(buf, "listrecp|");
+ safestrncpy(buf, "listrecp|", sizeof buf);
}
strcat(buf, email);
strcat(buf, "|");
}
}
if (!strcasecmp(cmd, "unsubpending")) {
- extract(line_token, buf, 2);
+ extract_token(line_token, buf, 2, '|', sizeof line_token);
if (!strcasecmp(token, line_token)) {
- extract(address_to_unsubscribe, buf, 1);
+ extract_token(address_to_unsubscribe, buf, 1, '|',
+ sizeof address_to_unsubscribe);
}
}
}
while (line_offset = ftell(ncfp),
(fgets(buf, sizeof buf, ncfp) != NULL) ) {
buf[strlen(buf)-1]=0;
- extract(scancmd, buf, 0);
- extract(scanemail, buf, 1);
+ extract_token(scancmd, buf, 0, '|', sizeof scancmd);
+ extract_token(scanemail, buf, 1, '|', sizeof scanemail);
if ( (!strcasecmp(scancmd, "listrecp"))
&& (!strcasecmp(scanemail,
address_to_unsubscribe)) ) {
*/
void cmd_subs(char *cmdbuf) {
- char opr[SIZ];
- char room[SIZ];
- char email[SIZ];
- char subtype[SIZ];
- char token[SIZ];
- char webpage[SIZ];
+ char opr[256];
+ char room[ROOMNAMELEN];
+ char email[256];
+ char subtype[256];
+ char token[256];
+ char webpage[256];
- extract(opr, cmdbuf, 0);
+ extract_token(opr, cmdbuf, 0, '|', sizeof opr);
if (!strcasecmp(opr, "subscribe")) {
- extract(subtype, cmdbuf, 3);
+ extract_token(subtype, cmdbuf, 3, '|', sizeof subtype);
if ( (strcasecmp(subtype, "list"))
&& (strcasecmp(subtype, "digest")) ) {
cprintf("%d Invalid subscription type '%s'\n",
ERROR + ILLEGAL_VALUE, subtype);
}
else {
- extract(room, cmdbuf, 1);
- extract(email, cmdbuf, 2);
- extract(webpage, cmdbuf, 4);
+ extract_token(room, cmdbuf, 1, '|', sizeof room);
+ extract_token(email, cmdbuf, 2, '|', sizeof email);
+ extract_token(webpage, cmdbuf, 4, '|', sizeof webpage);
do_subscribe(room, email, subtype, webpage);
}
}
else if (!strcasecmp(opr, "unsubscribe")) {
- extract(room, cmdbuf, 1);
- extract(email, cmdbuf, 2);
- extract(webpage, cmdbuf, 3);
+ extract_token(room, cmdbuf, 1, '|', sizeof room);
+ extract_token(email, cmdbuf, 2, '|', sizeof email);
+ extract_token(webpage, cmdbuf, 3, '|', sizeof webpage);
do_unsubscribe(room, email, webpage);
}
else if (!strcasecmp(opr, "confirm")) {
- extract(room, cmdbuf, 1);
- extract(token, cmdbuf, 2);
+ extract_token(room, cmdbuf, 1, '|', sizeof room);
+ extract_token(token, cmdbuf, 2, '|', sizeof token);
do_confirm(room, token);
}
else {
projects / citadel.git / blobdiff