#include "tools.h"
#include "mime_parser.h"
#include "html.h"
+#include "genstamp.h"
+#include "internet_addressing.h"
#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION))
#define ma ((struct ma_info *)CtdlGetUserData(SYM_MA_INFO))
"from",
"", "", "",
"exti",
- "", "",
+ "rfca",
+ "",
"hnod",
"msgn",
"", "", "",
fclose(fp);
lprintf(7, "Mail is being forwarded to %s\n", name);
+ /* Change "user @ xxx" to "user" if xxx is an alias for this host */
+ for (a=0; a<strlen(name); ++a) {
+ if (name[a] == '@') {
+ if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
+ name[a] = 0;
+ lprintf(7, "Changed to <%s>\n", name);
+ }
+ }
+ }
+
/* determine local or remote type, see citadel.h */
for (a = 0; a < strlen(name); ++a)
if (name[a] == '!')
fp = fopen("network/mail.sysinfo", "r");
if (fp == NULL)
return (MES_ERROR);
- GETSN:do {
+GETSN: do {
a = getstring(fp, aaa);
} while ((a >= 0) && (strcasecmp(aaa, bbb)));
a = getstring(fp, aaa);
while (bbb[strlen(bbb) - 1] == '_')
bbb[strlen(bbb) - 1] = 0;
sprintf(name, &aaa[4], bbb);
+ lprintf(9, "returning MES_INTERNET\n");
return (MES_INTERNET);
}
if (!strncmp(aaa, "bin", 3)) {
while (bbb[0] == ' ')
strcpy(bbb, &bbb[1]);
sprintf(name, "%s @%s", aaa, bbb);
+ lprintf(9, "returning MES_BINARY\n");
return (MES_BINARY);
}
return (MES_ERROR);
}
+ lprintf(9, "returning MES_LOCAL\n");
return (MES_LOCAL);
}
void memfmout(
int width, /* screen width to use */
char *mptr, /* where are we going to get our text from? */
- char subst) /* nonzero if we should do substitutions */
+ char subst, /* nonzero if we should do substitutions */
+ char *nl) /* string to terminate lines with */
{
int a, b, c;
int real = 0;
if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
ch = 32;
if (((old == 13) || (old == 10)) && (isspace(real))) {
- cprintf("\n");
+ cprintf("%s", nl);
c = 1;
}
if (ch > 126)
if (ch > 32) {
if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
- cprintf("\n%s", aaa);
+ cprintf("%s%s", nl, aaa);
c = strlen(aaa);
aaa[0] = 0;
}
}
if (ch == 32) {
if ((strlen(aaa) + c) > (width - 5)) {
- cprintf("\n");
+ cprintf("%s", nl);
c = 1;
}
cprintf("%s ", aaa);
goto FMTA;
}
if ((ch == 13) || (ch == 10)) {
- cprintf("%s\n", aaa);
+ cprintf("%s%s", aaa, nl);
c = 1;
strcpy(aaa, "");
goto FMTA;
}
goto FMTA;
-FMTEND: cprintf("%s\n", aaa);
+FMTEND: cprintf("%s%s", aaa, nl);
}
if (is_valid_message(msg) == 0) return;
for (i = 0; i < 256; ++i)
- if (msg->cm_fields[i] != NULL)
+ if (msg->cm_fields[i] != NULL) {
phree(msg->cm_fields[i]);
+ }
msg->cm_magic = 0; /* just in case */
phree(msg);
int do_proto, /* do Citadel protocol responses? */
int crlf /* Use CRLF newlines instead of LF? */
) {
- int a, i, k;
+ int i, k;
char buf[1024];
- time_t xtime;
CIT_UBYTE ch;
char allkeys[256];
char display_name[256];
/* buffers needed for RFC822 translation */
char suser[256];
char luser[256];
+ char fuser[256];
char snode[256];
char lnode[256];
char mid[256];
+ char datestamp[256];
/* */
lprintf(7, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
return(om_not_logged_in);
}
- /* FIX ... small security issue
+ /* FIXME ... small security issue
* We need to check to make sure the requested message is actually
* in the current room, and set msg_ok to 1 only if it is. This
* functionality is currently missing because I'm in a hurry to replace
strcpy(suser, "");
strcpy(luser, "");
+ strcpy(fuser, "");
strcpy(snode, NODENAME);
strcpy(lnode, HUMANNODE);
if (mode == MT_RFC822) {
if (i == 'A') {
strcpy(luser, mptr);
- } else if (i == 'P') {
- cprintf("Path: %s%s", mptr, nl);
- for (a = 0; a < strlen(mptr); ++a) {
- if (mptr[a] == '!') {
- strcpy(mptr, &mptr[a + 1]);
- a = 0;
- }
- }
strcpy(suser, mptr);
- } else if (i == 'U')
+ }
+ else if (i == 'P') {
+ cprintf("Path: %s%s", mptr, nl);
+ }
+ else if (i == 'U')
cprintf("Subject: %s%s", mptr, nl);
else if (i == 'I')
strcpy(mid, mptr);
else if (i == 'R')
cprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
- xtime = atol(mptr);
- cprintf("Date: %s", asctime(localtime(&xtime)));
+ generate_rfc822_datestamp(datestamp,
+ atol(mptr) );
+ cprintf("Date: %s%s", datestamp, nl);
}
}
}
}
+ for (i=0; i<strlen(suser); ++i) {
+ suser[i] = tolower(suser[i]);
+ if (!isalnum(suser[i])) suser[i]='_';
+ }
+
if (mode == MT_RFC822) {
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
cprintf("Message-ID: <%s@%s>%s", mid, snode, nl);
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
+
+ if (strlen(fuser) > 0) {
+ cprintf("From: %s (%s)%s", fuser, luser, nl);
+ }
+ else {
+ cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
+ }
+
cprintf("Organization: %s%s", lnode, nl);
}
return(om_ok);
}
else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
- /* FIX ... we have to put some code in here to avoid
+ /* FIXME ... we have to put some code in here to avoid
* printing duplicate header information when both
* Citadel and RFC822 headers exist. Preference should
* probably be given to the RFC822 headers.
if (mode == MT_CITADEL)
if (do_proto) cprintf("text\n");
if (mode == MT_RFC822) {
+ if (TheMessage->cm_fields['U'] == NULL) {
+ cprintf("Subject: (no subject)%s", nl);
+ }
cprintf("%s", nl);
}
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- memfmout(80, mptr, 0);
+ memfmout(80, mptr, 0, nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
/*
- * display a message (mode 4 - MIME) (FIX ... still evolving, not complete)
+ * display a message (mode 4 - MIME) (FIXME ... still evolving, not complete)
*/
void cmd_msg4(char *cmdbuf)
{
ret->len = ret->len +
strlen(msg->cm_fields[(int)forder[i]]) + 2;
- lprintf(9, "calling malloc\n");
+ lprintf(9, "calling malloc(%d)\n", ret->len);
ret->ser = mallok(ret->len);
if (ret->ser == NULL) {
ret->len = 0;
long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
char *rec, /* Recipient (mail) */
char *force, /* force a particular room? */
- int mailtype, /* local or remote type */
+ int supplied_mailtype, /* local or remote type */
int generate_id) /* 1 = generate 'I' field */
{
char aaa[100];
static int seqnum = 1;
struct CtdlMessage *imsg;
char *instr;
+ int mailtype;
lprintf(9, "CtdlSaveMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
+ mailtype = supplied_mailtype;
/* If this message has no timestamp, we take the liberty of
* giving it one, right now.
strcpy(force_room, force);
/* Strip non-printable characters out of the recipient name */
+ lprintf(9, "Checking recipient (if present)\n");
strcpy(recipient, rec);
for (a = 0; a < strlen(recipient); ++a)
if (!isprint(recipient[a]))
strcpy(&recipient[a], &recipient[a + 1]);
+ /* Change "user @ xxx" to "user" if xxx is an alias for this host */
+ for (a=0; a<strlen(recipient); ++a) {
+ if (recipient[a] == '@') {
+ if (CtdlHostAlias(&recipient[a+1])
+ == hostalias_localhost) {
+ recipient[a] = 0;
+ lprintf(7, "Changed to <%s>\n", recipient);
+ mailtype = MES_LOCAL;
+ }
+ }
+ }
+
+ lprintf(9, "Recipient is <%s>\n", recipient);
+
/* Learn about what's inside, because it's what's inside that counts */
lprintf(9, "Learning what's inside\n");
if (msg->cm_fields['M'] == NULL) {
* is no local sender; it would otherwise go to the Trashcan).
*/
if ((!CC->internal_pgm) || (strlen(recipient) == 0)) {
- CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+ if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+ lprintf(3, "ERROR saving message pointer!\n");
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* For internet mail, drop a copy in the outbound queue room */
MailboxName(actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ else {
+ lprintf(9, "No user <%s>, saving in %s> instead\n",
+ recipient, AIDEROOM);
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* Perform "after save" hooks */
instr = mallok(2048);
sprintf(instr,
"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+ "bounceto|%s@%s\n"
"remote|%s|0||\n",
- SPOOLMIME, newmsgid, time(NULL), recipient );
+ SPOOLMIME, newmsgid, time(NULL),
+ msg->cm_fields['A'], msg->cm_fields['N'],
+ recipient );
imsg = mallok(sizeof(struct CtdlMessage));
memset(imsg, 0, sizeof(struct CtdlMessage));
projects / citadel.git / blobdiff