#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
);
/* Convert it to base64 so it looks cool */
- encode_base64(buf, sourcebuf);
+ CtdlEncodeBase64(buf, sourcebuf, strlen(sourcebuf));
}
char filename[SIZ];
char token[SIZ];
char confirmation_request[SIZ];
+ char buf[SIZ];
char urlroom[SIZ];
+ char scancmd[SIZ];
+ char scanemail[SIZ];
+ int found_sub = 0;
if (getroom(&qrbuf, room) != 0) {
cprintf("%d There is no list called '%s'\n", ERROR, room);
listsub_generate_token(token);
- begin_critical_section(S_NETCONFIGS);
assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+
+ /*
+ * Make sure the requested address isn't already subscribed
+ */
+ begin_critical_section(S_NETCONFIGS);
+ ncfp = fopen(filename, "r");
+ if (ncfp != NULL) {
+ while (fgets(buf, sizeof buf, ncfp) != NULL) {
+ buf[strlen(buf)-1] = 0;
+ extract(scancmd, buf, 0);
+ extract(scanemail, buf, 1);
+ if ((!strcasecmp(scancmd, "listrecp"))
+ || (!strcasecmp(scancmd, "digestrecp"))) {
+ if (!strcasecmp(scanemail, email)) {
+ ++found_sub;
+ }
+ }
+ }
+ fclose(ncfp);
+ }
+ end_critical_section(S_NETCONFIGS);
+
+ if (found_sub != 0) {
+ cprintf("%d '%s' is already subscribed to '%s'.\n",
+ ERROR,
+ email, qrbuf.QRname);
+ return;
+ }
+
+ /*
+ * Now add it to the file
+ */
+ begin_critical_section(S_NETCONFIGS);
ncfp = fopen(filename, "a");
if (ncfp != NULL) {
fprintf(ncfp, "subpending|%s|%s|%s|%ld|%s\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\">"
- "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 */
email,
NULL,
confirmation_request,
- FMT_RFC822
+ FMT_RFC822,
+ "Please confirm your list subscription"
);
cprintf("%d Subscription entered; confirmation request sent\n", CIT_OK);
"Content-type: text/html\n\n"
"<HTML><BODY>"
"Someone (probably you) has submitted a request "
- "to un subscribe\n"
+ "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\">"
- "Please click here to confirm this request.</A><BR><BR>\n"
- "If this request has been submitted in error and you do not\n"
- "wish to unsubscribe from the "
+ "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 */
email,
NULL,
confirmation_request,
- FMT_RFC822
+ FMT_RFC822,
+ "Please confirm your unsubscribe request"
);
cprintf("%d Unubscription noted; confirmation request sent\n", CIT_OK);
char email[SIZ];
char subtype[SIZ];
int success = 0;
+ char address_to_unsubscribe[SIZ];
+ char scancmd[SIZ];
+ char scanemail[SIZ];
+ char *holdbuf = NULL;
+ int linelen = 0;
+ int buflen = 0;
+
+ strcpy(address_to_unsubscribe, "");
if (getroom(&qrbuf, room) != 0) {
cprintf("%d There is no list called '%s'\n",
return;
}
- begin_critical_section(S_NETCONFIGS);
+ /*
+ * 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+");
if (ncfp != NULL) {
while (line_offset = ftell(ncfp),
++success;
}
}
+ if (!strcasecmp(cmd, "unsubpending")) {
+ extract(line_token, buf, 2);
+ if (!strcasecmp(token, line_token)) {
+ extract(address_to_unsubscribe, buf, 1);
+ }
+ }
}
fclose(ncfp);
}
end_critical_section(S_NETCONFIGS);
+ /*
+ * If "address_to_unsubscribe" contains something, then we have to
+ * make another pass at the file, stripping out lines referring to
+ * that address.
+ */
+ if (strlen(address_to_unsubscribe) > 0) {
+ holdbuf = mallok(SIZ);
+ begin_critical_section(S_NETCONFIGS);
+ ncfp = fopen(filename, "r+");
+ if (ncfp != NULL) {
+ while (line_offset = ftell(ncfp),
+ (fgets(buf, sizeof buf, ncfp) != NULL) ) {
+ buf[strlen(buf)-1]=0;
+ extract(scancmd, buf, 0);
+ extract(scanemail, buf, 1);
+ if ( (!strcasecmp(scancmd, "listrecp"))
+ && (!strcasecmp(scanemail,
+ address_to_unsubscribe)) ) {
+ ++success;
+ }
+ else if ( (!strcasecmp(scancmd, "digestrecp"))
+ && (!strcasecmp(scanemail,
+ address_to_unsubscribe)) ) {
+ ++success;
+ }
+ else if ( (!strcasecmp(scancmd, "subpending"))
+ && (!strcasecmp(scanemail,
+ address_to_unsubscribe)) ) {
+ ++success;
+ }
+ else if ( (!strcasecmp(scancmd, "unsubpending"))
+ && (!strcasecmp(scanemail,
+ address_to_unsubscribe)) ) {
+ ++success;
+ }
+ else { /* Not relevant, so *keep* it! */
+ linelen = strlen(buf);
+ holdbuf = reallok(holdbuf,
+ (buflen + linelen + 2) );
+ strcpy(&holdbuf[buflen], buf);
+ buflen += linelen;
+ strcpy(&holdbuf[buflen], "\n");
+ buflen += 1;
+ }
+ }
+ fclose(ncfp);
+ }
+ ncfp = fopen(filename, "w");
+ if (ncfp != NULL) {
+ fwrite(holdbuf, buflen+1, 1, ncfp);
+ fclose(ncfp);
+ }
+ end_critical_section(S_NETCONFIGS);
+ phree(holdbuf);
+ }
+
+ /*
+ * Did we do anything useful today?
+ */
if (success) {
cprintf("%d %d operation(s) confirmed.\n", CIT_OK, success);
}
extract(subtype, cmdbuf, 3);
if ( (strcasecmp(subtype, "list"))
&& (strcasecmp(subtype, "digest")) ) {
- cprintf("%d Invalid subscription type.\n", ERROR);
+ cprintf("%d Invalid subscription type '%s'\n",
+ ERROR+ILLEGAL_VALUE, subtype);
}
else {
extract(room, cmdbuf, 1);
else if (!strcasecmp(opr, "unsubscribe")) {
extract(room, cmdbuf, 1);
extract(email, cmdbuf, 2);
- extract(webpage, cmdbuf, 4);
+ extract(webpage, cmdbuf, 3);
do_unsubscribe(room, email, webpage);
}
else if (!strcasecmp(opr, "confirm")) {
/*
* Module entry point
*/
-char *Dynamic_Module_Init(void)
+char *serv_listsub_init(void)
{
CtdlRegisterProtoHook(cmd_subs, "SUBS", "List subscribe/unsubscribe");
return "$Id$";
projects / citadel.git / blobdiff