+/* $Id$ */
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <syslog.h>
+#ifdef HAVE_PTHREAD_H
#include <pthread.h>
+#endif
+#include <limits.h>
#include "citadel.h"
#include "server.h"
#include <errno.h>
#include "msgbase.h"
#include "support.h"
#include "sysdep_decls.h"
+#include "citserver.h"
#include "room_ops.h"
#include "user_ops.h"
+#include "file_ops.h"
#include "control.h"
#include "dynloader.h"
+#include "tools.h"
+#include "mime_parser.h"
#define MSGS_ALL 0
#define MSGS_OLD 1
#define MSGS_LAST 4
#define MSGS_GT 5
+#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION))
+
extern struct config config;
+/*
+ * This function is self explanatory.
+ * (What can I say, I'm in a weird mood today...)
+ */
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
+ int i;
+
+ for (i=0; i<strlen(name); ++i) if (name[i]=='@') {
+ if (i>0) if (isspace(name[i-1])) {
+ strcpy(&name[i-1], &name[i]);
+ i = 0;
+ }
+ while (isspace(name[i+1])) {
+ strcpy(&name[i+1], &name[i+2]);
+ }
+ }
+ }
+
+
/*
* Aliasing for network mail.
* (Error messages have been commented out, because this is a server.)
FILE *fp;
int a,b;
char aaa[300],bbb[300];
-
+
+ lprintf(9, "alias() called for <%s>\n", name);
+
+ remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
+
fp=fopen("network/mail.aliases","r");
if (fp==NULL) fp=fopen("/dev/null","r");
- if (fp==NULL) return(M_ERROR);
-GNA: strcpy(aaa,""); strcpy(bbb,"");
- do {
- a=getc(fp);
- if (a==',') a=0;
- if (a>0) {
- b=strlen(aaa);
- aaa[b]=a;
- aaa[b+1]=0;
- }
- } while(a>0);
- do {
- a=getc(fp);
- if (a==10) a=0;
- if (a>0) {
- b=strlen(bbb);
- bbb[b]=a;
- bbb[b+1]=0;
+ if (fp==NULL) return(MES_ERROR);
+ strcpy(aaa,""); strcpy(bbb,"");
+ while (fgets(aaa, sizeof aaa, fp)!=NULL) {
+ while (isspace(name[0])) strcpy(name, &name[1]);
+ aaa[strlen(aaa)-1] = 0;
+ strcpy(bbb, "");
+ for (a=0; a<strlen(aaa); ++a) {
+ if (aaa[a] == ',') {
+ strcpy(bbb, &aaa[a+1]);
+ aaa[a] = 0;
+ }
}
- } while(a>0);
- if (a<0) {
- fclose(fp);
- goto DETYPE;
+ if (!strcasecmp(name, aaa)) strcpy(name, bbb);
}
- if (strcasecmp(name,aaa)) goto GNA;
fclose(fp);
- strcpy(name,bbb);
lprintf(7, "Mail is being forwarded to %s\n", name);
-DETYPE: /* determine local or remote type, see citadel.h */
- for (a=0; a<strlen(name); ++a) if (name[a]=='!') return(M_INTERNET);
+ /* determine local or remote type, see citadel.h */
+ for (a=0; a<strlen(name); ++a) if (name[a]=='!') return(MES_INTERNET);
for (a=0; a<strlen(name); ++a)
if (name[a]=='@')
for (b=a; b<strlen(name); ++b)
- if (name[b]=='.') return(M_INTERNET);
+ if (name[b]=='.') return(MES_INTERNET);
b=0; for (a=0; a<strlen(name); ++a) if (name[a]=='@') ++b;
if (b>1) {
lprintf(7, "Too many @'s in address\n");
- return(M_ERROR);
+ return(MES_ERROR);
}
if (b==1) {
for (a=0; a<strlen(name); ++a)
if (name[a]=='@') strcpy(bbb,&name[a+1]);
while (bbb[0]==32) strcpy(bbb,&bbb[1]);
fp = fopen("network/mail.sysinfo","r");
- if (fp==NULL) return(M_ERROR);
+ if (fp==NULL) return(MES_ERROR);
GETSN: do {
a=getstring(fp,aaa);
} while ((a>=0)&&(strcasecmp(aaa,bbb)));
}
while(bbb[strlen(bbb)-1]=='_') bbb[strlen(bbb)-1]=0;
sprintf(name,&aaa[4],bbb);
- return(M_INTERNET);
+ return(MES_INTERNET);
}
if (!strncmp(aaa,"bin",3)) {
strcpy(aaa,name); strcpy(bbb,name);
strcpy(bbb,&bbb[1]);
while (bbb[0]==' ') strcpy(bbb,&bbb[1]);
sprintf(name,"%s @%s",aaa,bbb);
- return(M_BINARY);
+ return(MES_BINARY);
}
- return(M_ERROR);
+ return(MES_ERROR);
}
- return(M_LOCAL);
+ return(MES_LOCAL);
}
}
goto FMTA;
-FMTEND: cprintf("\n");
+FMTEND: cprintf("%s\n", aaa);
}
+
/*
- * get a message off disk.
+ * Callback function for mime parser that simply lists the part
+ */
+void list_this_part(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length) {
+
+ cprintf("part=%s|%s|%s|%s|%s|%d\n",
+ name, filename, partnum, disp, cbtype, length);
+ }
+
+
+/*
+ * Callback function for mime parser that wants to display text
+ */
+void fixed_output(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length) {
+
+ if (!strcasecmp(cbtype, "text/plain")) {
+ client_write(content, length);
+ }
+ else {
+ cprintf("Part %s: %s (%s) (%d bytes)\n",
+ partnum, filename, cbtype, length);
+ }
+ }
+
+
+/*
+ * Callback function for mime parser that opens a section for downloading
+ */
+void mime_download(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length) {
+
+ char tmpname[PATH_MAX];
+ static int seq = 0;
+
+ /* Silently go away if there's already a download open... */
+ if (CC->download_fp != NULL) return;
+
+ /* ...or if this is not the desired section */
+ if (strcasecmp(desired_section, partnum)) return;
+
+ snprintf(tmpname, sizeof tmpname,
+ "/tmp/CitServer.download.%4x.%4x", getpid(), ++seq);
+
+ CC->download_fp = fopen(tmpname, "wb+");
+ if (CC->download_fp == NULL) return;
+
+ /* Unlink the file while it's open, to guarantee that the
+ * temp file will always be deleted.
+ */
+ unlink(tmpname);
+
+ fwrite(content, length, 1, CC->download_fp);
+ fflush(CC->download_fp);
+ rewind(CC->download_fp);
+
+ OpenCmdResult(filename, cbtype);
+ }
+
+
+
+/*
+ * Get a message off disk. (return value is the message's timestamp)
*
*/
-void output_message(char *msgid, int mode,
- int headers_only, int desired_section) {
+time_t output_message(char *msgid, int mode, int headers_only) {
long msg_num;
int a;
CIT_UBYTE ch, rch;
char buf[1024];
long msg_len;
int msg_ok = 0;
- char boundary[256]; /* attachment boundary */
- char current_section = 0; /* section currently being parsed */
- int has_attachments = 0;
struct cdbdata *dmsgtext;
char *mptr;
char snode[256];
char lnode[256];
char mid[256];
- time_t xtime;
- /* */
+ time_t xtime = 0L;
+ /* */
- strcpy(boundary, "");
msg_num = atol(msgid);
- if ((!(CC->logged_in))&&(!(CC->internal_pgm))) {
+ if ((!(CC->logged_in))&&(!(CC->internal_pgm))&&(mode!=MT_DATE)) {
cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
+ return(xtime);
}
/* We used to need to check in the current room's message list
}
if (!msg_ok) {
- cprintf("%d Message %ld is not in this room.\n",
- ERROR, msg_num);
- return;
+ if (mode != MT_DATE)
+ cprintf("%d Message %ld is not in this room.\n",
+ ERROR, msg_num);
+ return(xtime);
}
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msg_num, sizeof(long));
if (dmsgtext == NULL) {
- cprintf("%d Can't find message %ld\n", ERROR+INTERNAL_ERROR);
- return;
+ if (mode != MT_DATE)
+ cprintf("%d Can't find message %ld\n",
+ ERROR+INTERNAL_ERROR);
+ return(xtime);
}
msg_len = (long) dmsgtext->len;
cprintf("%d %ld\n", BINARY_FOLLOWS, msg_len);
client_write(dmsgtext->ptr, (int) msg_len);
cdb_free(dmsgtext);
- return;
+ return(xtime);
}
/* Otherwise, we'll start parsing it field by field... */
cprintf("%d Illegal message format on disk\n",
ERROR+INTERNAL_ERROR);
cdb_free(dmsgtext);
- return;
+ return(xtime);
}
anon_flag = *mptr++;
format_type = *mptr++;
+ /* Are we downloading a MIME component? */
+ if (mode == MT_DOWNLOAD) {
+ if (format_type != 4) {
+ cprintf("%d This is not a MIME message.\n",
+ ERROR);
+ }
+ else if (CC->download_fp != NULL) {
+ cprintf("%d You already have a download open.\n",
+ ERROR);
+ }
+ else {
+ /* Skip to the message body */
+ while(ch = *mptr++, (ch!='M' && ch!=0)) {
+ buf[0] = 0;
+ do {
+ buf[strlen(buf)+1] = 0;
+ rch = *mptr++;
+ buf[strlen(buf)] = rch;
+ } while (rch > 0);
+ }
+ /* Now parse it */
+ mime_parser(mptr, NULL, *mime_download);
+ /* If there's no file open by this time, the requested
+ * section wasn't found, so print an error
+ */
+ if (CC->download_fp == NULL) {
+ cprintf("%d Section %s not found.\n",
+ ERROR+FILE_NOT_FOUND,
+ desired_section);
+ }
+ }
+ cdb_free(dmsgtext);
+ return(xtime);
+ }
+
+ /* Are we just looking for the message date? */
+ if (mode == MT_DATE) while(ch = *mptr++, (ch!='M' && ch!=0)) {
+ buf[0] = 0;
+ do {
+ buf[strlen(buf)+1] = 0;
+ rch = *mptr++;
+ buf[strlen(buf)] = rch;
+ } while (rch > 0);
+
+ if (ch=='T') {
+ xtime = atol(buf);
+ cdb_free(dmsgtext);
+ return(xtime);
+ }
+ }
+
+
/* now for the user-mode message reading loops */
cprintf("%d Message %ld:\n",LISTING_FOLLOWS,msg_num);
- if (mode == MT_CITADEL) cprintf("type=%d\n",format_type);
+ if (mode == MT_CITADEL) cprintf("type=%d\n", format_type);
if ( (anon_flag == MES_ANON) && (mode == MT_CITADEL) ) {
cprintf("nhdr=yes\n");
/* begin header processing loop for Citadel message format */
- if (mode == MT_CITADEL) while(ch = *mptr++, (ch!='M' && ch!=0)) {
+ if ((mode == MT_CITADEL)||(mode == MT_MIME))
+ while(ch = *mptr++, (ch!='M' && ch!=0)) {
buf[0] = 0;
do {
buf[strlen(buf)+1] = 0;
cprintf(" [%s]",buf);
cprintf("\n");
}
- else if (ch=='Z') {
- has_attachments = 1;
- sprintf(boundary, "--%s", buf);
- }
else if (ch=='P') cprintf("path=%s\n",buf);
else if (ch=='U') cprintf("subj=%s\n",buf);
else if (ch=='I') cprintf("msgn=%s\n",buf);
if (ch==0) {
cprintf("text\n*** ?Message truncated\n000\n");
cdb_free(dmsgtext);
- return;
+ return(xtime);
+ }
+
+ /* do some sort of MIME output */
+ if (format_type == 4) {
+ if ((mode == MT_CITADEL)||(mode == MT_MIME)) {
+ mime_parser(mptr, NULL, *list_this_part);
+ }
+ if (mode == MT_MIME) { /* If MT_MIME then it's parts only */
+ cprintf("000\n");
+ cdb_free(dmsgtext);
+ return(xtime);
+ }
}
if (headers_only) {
cprintf("mlen=%ld\n", msg_len);
cprintf("000\n");
cdb_free(dmsgtext);
- return;
+ return(xtime);
}
/* signify start of msg text */
if (mode == MT_CITADEL) cprintf("text\n");
- if (mode == MT_RFC822) cprintf("\n");
+ if ( (mode == MT_RFC822) && (format_type != 4) ) cprintf("\n");
/* If the format type on disk is 1 (fixed-format), then we want
* everything to be output completely literally ... regardless of
while(ch = *mptr++, ch>0) {
if (ch == 13) ch = 10;
if ( (ch == 10) || (strlen(buf)>250) ) {
- if (has_attachments) if (!strncmp(buf, boundary, strlen(boundary))) {
- ++current_section;
- }
- if (current_section == desired_section) {
- if ( (has_attachments == 0) || (strncmp(buf, boundary, strlen(boundary)))) {
- cprintf("%s\n", buf);
- }
- }
+ cprintf("%s\n", buf);
strcpy(buf, "");
}
else {
if (format_type == 0) {
memfmout(80,mptr,0);
}
-
+ /* If the message on disk is format 4 (MIME), we've gotta hand it
+ * off to the MIME parser. The client has already been told that
+ * this message is format 1 (fixed format), so the callback function
+ * we use will display those parts as-is.
+ */
+ if (format_type == 4) {
+ mime_parser(mptr, NULL, *fixed_output);
+ }
/* now we're done */
cprintf("000\n");
cdb_free(dmsgtext);
+ return(xtime);
}
{
char msgid[256];
int headers_only = 0;
- int desired_section = 0;
extract(msgid,cmdbuf,0);
headers_only = extract_int(cmdbuf, 1);
- desired_section = extract_int(cmdbuf, 2);
- output_message(msgid,MT_CITADEL, headers_only, desired_section);
+ output_message(msgid, MT_CITADEL, headers_only);
+ return;
}
extract(msgid,cmdbuf,0);
headers_only = extract_int(cmdbuf,1);
- output_message(msgid,MT_RFC822,headers_only,0);
+ output_message(msgid,MT_RFC822,headers_only);
}
/*
extract(msgid,cmdbuf,0);
headers_only = extract_int(cmdbuf,1);
- output_message(msgid,MT_RAW,headers_only,0);
+ output_message(msgid,MT_RAW,headers_only);
+ }
+
+/*
+ * display a message (mode 4 - MIME) (FIX ... still evolving, not complete)
+ */
+void cmd_msg4(char *cmdbuf)
+{
+ char msgid[256];
+
+ extract(msgid, cmdbuf, 0);
+
+ output_message(msgid, MT_MIME, 0);
+ }
+
+
+
+/*
+ * Open a component of a MIME message as a download file
+ */
+void cmd_opna(char *cmdbuf)
+{
+ char msgid[256];
+
+ CtdlAllocUserData(SYM_DESIRED_SECTION, 64);
+
+ extract(msgid, cmdbuf, 0);
+ extract(desired_section, cmdbuf, 1);
+
+ output_message(msgid, MT_DOWNLOAD, 0);
}
int generate_id) { /* 1 to generate an I field */
long newmsgid;
+ char *actual_message;
+ size_t actual_length;
+ long retval;
+ char msgidbuf[32];
/* Get a new message number */
newmsgid = get_new_message_number();
- /* Write our little bundle of joy into the message base */
+ if (generate_id) {
+ sprintf(msgidbuf, "I%ld", newmsgid);
+ actual_length = message_length + strlen(msgidbuf) + 1;
+ actual_message = mallok(actual_length);
+ memcpy(actual_message, message_in_memory, 3);
+ memcpy(&actual_message[3], msgidbuf, (strlen(msgidbuf)+1) );
+ memcpy(&actual_message[strlen(msgidbuf)+4],
+ &message_in_memory[3], message_length - 3);
+ }
+
+ else {
+ actual_message = message_in_memory;
+ actual_length = message_length;
+ }
+ /* Write our little bundle of joy into the message base */
begin_critical_section(S_MSGMAIN);
if ( cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
- message_in_memory, message_length) < 0 ) {
+ actual_message, actual_length) < 0 ) {
lprintf(2, "Can't store message\n");
- end_critical_section(S_MSGMAIN);
- return 0L;
+ retval = 0L;
+ }
+ else {
+ retval = newmsgid;
}
end_critical_section(S_MSGMAIN);
+ if (generate_id) {
+ phree(actual_message);
+ }
+
/* Finally, return the pointers */
- return(newmsgid);
+ return(retval);
}
*/
void save_message(char *mtmp, /* file containing proper message */
char *rec, /* Recipient (if mail) */
- char mtsflag, /* 0 for normal, 1 to force Aide> room */
+ char *force, /* if non-zero length, force a room */
int mailtype, /* local or remote type, see citadel.h */
int generate_id) /* set to 1 to generate an 'I' field */
{
char aaa[100];
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
+ char force_room[ROOMNAMELEN];
char recipient[256];
long newmsgid;
char *message_in_memory;
size_t templen;
FILE *fp;
struct usersupp userbuf;
+ int a;
+ static int seqnum = 0;
+
+ lprintf(9, "save_message(%s,%s,%s,%d,%d)\n",
+ mtmp, rec, force, mailtype, generate_id);
+
+ strcpy(force_room, force);
+
+ /* Strip non-printable characters out of the recipient name */
+ strcpy(recipient, rec);
+ for (a=0; a<strlen(recipient); ++a)
+ if (!isprint(recipient[a]))
+ strcpy(&recipient[a], &recipient[a+1]);
/* Measure the message */
stat(mtmp, &statbuf);
templen = statbuf.st_size;
/* Now read it into memory */
- message_in_memory = (char *) malloc(templen);
+ message_in_memory = (char *) mallok(templen);
if (message_in_memory == NULL) {
lprintf(2, "Can't allocate memory to save message!\n");
return;
fclose(fp);
newmsgid = send_message(message_in_memory, templen, generate_id);
- free(message_in_memory);
+ phree(message_in_memory);
if (newmsgid <= 0L) return;
strcpy(actual_rm, CC->quickroom.QRname);
strcpy(hold_rm, "");
- strcpy(recipient, rec);
/* If the user is a twit, move to the twit room for posting... */
if (TWITDETECT) if (CC->usersupp.axlevel==2) {
}
/* ...or if this is a private message, go to the target mailbox. */
+ lprintf(9, "mailbox aliasing loop\n");
if (strlen(recipient) > 0) {
- mailtype = alias(recipient);
- if (mailtype == M_LOCAL) {
+ /* mailtype = alias(recipient); */
+ if (mailtype == MES_LOCAL) {
if (getuser(&userbuf, recipient)!=0) {
- mtsflag = 1; /* User not found, goto Aide */
+ /* User not found, goto Aide */
+ strcpy(force_room, AIDEROOM);
}
else {
strcpy(hold_rm, actual_rm);
}
/* ...or if this message is destined for Aide> then go there. */
- if (mtsflag) {
+ lprintf(9, "actual room forcing loop\n");
+ if (strlen(force_room) > 0) {
strcpy(hold_rm, actual_rm);
- strcpy(actual_rm, AIDEROOM);
+ strcpy(actual_rm, force_room);
}
-
/* This call to usergoto() changes rooms if necessary. It also
* causes the latest message list to be read into memory.
*/
/* read in the quickroom record, obtaining a lock... */
lgetroom(&CC->quickroom, actual_rm);
- get_msglist(&CC->quickroom);
- /* FIX here's where we have to handle message expiry!! */
-
- /* Now add the new message */
- CC->num_msgs = CC->num_msgs + 1;
- CC->msglist = realloc(CC->msglist,
- ((CC->num_msgs) * sizeof(long)) );
- if (CC->msglist == NULL) {
- lprintf(3, "ERROR: can't realloc message list!\n");
+ /* Fix an obscure bug */
+ if (!strcasecmp(CC->quickroom.QRname, AIDEROOM)) {
+ CC->quickroom.QRflags = CC->quickroom.QRflags & ~QR_MAILBOX;
}
- SetMessageInList(CC->num_msgs - 1, newmsgid);
- /* Write it back to disk. */
- put_msglist(&CC->quickroom);
+ /* Add the message pointer to the room */
+ CC->quickroom.QRhighest = AddMessageToRoom(&CC->quickroom, newmsgid);
/* update quickroom */
- CC->quickroom.QRhighest = newmsgid;
lputroom(&CC->quickroom, actual_rm);
+ /* Network mail - send a copy to the network program. */
+ if ( (strlen(recipient)>0) && (mailtype != MES_LOCAL) ) {
+ sprintf(aaa,"./network/spoolin/netmail.%04lx.%04x.%04x",
+ (long)getpid(), CC->cs_pid, ++seqnum);
+ copy_file(mtmp,aaa);
+ system("exec nohup ./netproc -i >/dev/null 2>&1 &");
+ }
+
/* Bump this user's messages posted counter. */
lgetuser(&CC->usersupp, CC->curr_user);
CC->usersupp.posted = CC->usersupp.posted + 1;
lputuser(&CC->usersupp, CC->curr_user);
- /* Network mail - send a copy to the network program. */
- if ( (strlen(recipient)>0) && (mailtype != M_LOCAL) ) {
- sprintf(aaa,"./network/spoolin/nm.%d",getpid());
- copy_file(mtmp,aaa);
- system("exec nohup ./netproc >/dev/null 2>&1 &");
- }
-
/* If we've posted in a room other than the current room, then we
* have to now go back to the current room...
*/
*/
void aide_message(char *text)
{
- time_t now;
FILE *fp;
- time(&now);
fp=fopen(CC->temp,"wb");
fprintf(fp,"%c%c%c",255,MES_NORMAL,0);
fprintf(fp,"Psysop%c",0);
- fprintf(fp,"T%ld%c",now,0);
+ fprintf(fp,"T%ld%c", (long)time(NULL), 0);
fprintf(fp,"ACitadel%c",0);
fprintf(fp,"OAide%c",0);
fprintf(fp,"N%s%c",NODENAME,0);
fprintf(fp,"M%s\n%c",text,0);
fclose(fp);
- save_message(CC->temp,"",1,M_LOCAL,1);
+ save_message(CC->temp,"",AIDEROOM,MES_LOCAL,1);
syslog(LOG_NOTICE,text);
}
int type, /* see MES_ types in header file */
int net_type, /* see MES_ types in header file */
int format_type, /* local or remote (see citadel.h) */
- char *fake_name, /* who we're masquerading as */
- char *boundary) { /* boundary (if exist attachments) */
+ char *fake_name) { /* who we're masquerading as */
FILE *fp;
int a;
/* Don't confuse the poor folks if it's not routed mail. */
strcpy(dest_node, "");
- /* If net_type is M_BINARY, split out the destination node. */
- if (net_type == M_BINARY) {
+
+ /* If net_type is MES_BINARY, split out the destination node. */
+ if (net_type == MES_BINARY) {
strcpy(dest_node,NODENAME);
for (a=0; a<strlen(recipient); ++a) {
if (recipient[a]=='@') {
}
}
- /* if net_type is M_INTERNET, set the dest node to 'internet' */
- if (net_type == M_INTERNET) {
+ /* if net_type is MES_INTERNET, set the dest node to 'internet' */
+ if (net_type == MES_INTERNET) {
strcpy(dest_node,"internet");
}
putc(type,fp); /* Normal or anonymous, see MES_ flags */
putc(format_type,fp); /* Formatted or unformatted */
fprintf(fp,"Pcit%ld%c",author->usernum,0); /* path */
- fprintf(fp,"T%ld%c",now,0); /* date/time */
+ fprintf(fp,"T%ld%c",(long)now,0); /* date/time */
if (fake_name[0])
fprintf(fp,"A%s%c",fake_name,0);
else
fprintf(fp,"A%s%c",author->fullname,0); /* author */
- fprintf(fp,"O%s%c",CC->quickroom.QRname,0); /* room */
+
+ if (CC->quickroom.QRflags & QR_MAILBOX) { /* room */
+ fprintf(fp,"O%s%c", &CC->quickroom.QRname[11], 0);
+ }
+ else {
+ fprintf(fp,"O%s%c",CC->quickroom.QRname,0);
+ }
+
fprintf(fp,"N%s%c",NODENAME,0); /* nodename */
fprintf(fp,"H%s%c",HUMANNODE,0); /* human nodename */
if (recipient[0]!=0) fprintf(fp, "R%s%c", recipient, 0);
if (dest_node[0]!=0) fprintf(fp, "D%s%c", dest_node, 0);
- if (boundary[0]!=0) fprintf(fp, "Z%s%c", boundary, 0);
putc('M',fp);
int anon_flag = 0;
int format_type = 0;
char newusername[256]; /* <bc> */
- char boundary[256];
int a,b;
int e = 0;
extract(recipient,entargs,1);
anon_flag = extract_int(entargs,2);
format_type = extract_int(entargs,3);
- extract(boundary, entargs, 5);
/* first check to make sure the request is valid. */
return;
}
extract(newusername,entargs,4);
- bzero(CC->fake_postname, 32);
+ memset(CC->fake_postname, 0, 32);
strcpy(CC->fake_postname, newusername);
cprintf("%d Ok\n",OK);
return;
strcpy(buf,recipient);
}
else strcpy(buf,"sysop");
+ lprintf(9, "calling alias()\n");
e=alias(buf); /* alias and mail type */
- if ((buf[0]==0) || (e==M_ERROR)) {
+ lprintf(9, "alias() returned %d\n", e);
+ if ((buf[0]==0) || (e==MES_ERROR)) {
cprintf("%d Unknown address - cannot send message.\n",
ERROR+NO_SUCH_USER);
return;
}
- if ((e!=M_LOCAL)&&(CC->usersupp.axlevel<4)) {
+ if ((e!=MES_LOCAL)&&(CC->usersupp.axlevel<4)) {
cprintf("%d Net privileges required for network mail.\n",
ERROR+HIGHER_ACCESS_REQUIRED);
return;
}
- if ((RESTRICT_INTERNET==1)&&(e==M_INTERNET)
+ if ((RESTRICT_INTERNET==1)&&(e==MES_INTERNET)
&&((CC->usersupp.flags&US_INTERNET)==0)
&&(!CC->internal_pgm) ) {
cprintf("%d You don't have access to Internet mail.\n",
mtsflag=1;
goto SKFALL;
}
- if (e!=M_LOCAL) goto SKFALL; /* don't search local file */
+ if (e!=MES_LOCAL) goto SKFALL; /* don't search local file */
if (!strcasecmp(buf,CC->usersupp.fullname)) {
cprintf("%d Can't send mail to yourself!\n",
ERROR+NO_SUCH_USER);
/* Check to make sure the user exists; also get the correct
* upper/lower casing of the name.
*/
- a = getuser(&tempUS,buf);
+ a = getuser(&tempUS, buf);
if (a != 0) {
cprintf("%d No such user.\n",ERROR+NO_SUCH_USER);
return;
cprintf("%d send message\n",SEND_LISTING);
if (CC->fake_postname[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname, boundary);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname);
else
if (CC->fake_username[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username, boundary);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username);
else
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "", boundary);
- save_message(CC->temp,buf,mtsflag,e,1);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "");
+ save_message(CC->temp,buf, (mtsflag ? AIDEROOM : ""), e,1);
CC->fake_postname[0]='\0';
return;
}
return;
}
+ /* See if there's a recipient, but make sure it's a real one */
+ extract(recp, entargs, 1);
+ for (a=0; a<strlen(recp); ++a)
+ if (!isprint(recp[a]))
+ strcpy(&recp[a], &recp[a+1]);
+ while (isspace(recp[0])) strcpy(recp, &recp[1]);
+ while (isspace(recp[strlen(recp)-1])) recp[strlen(recp)-1] = 0;
+
/* If we're in Mail, check the recipient */
- if (CC->quickroom.QRflags & QR_MAILBOX) {
- extract(recp, entargs, 1);
+ if (strlen(recp) > 0) {
e=alias(recp); /* alias and mail type */
- if ((buf[0]==0) || (e==M_ERROR)) {
+ if ((recp[0]==0) || (e==MES_ERROR)) {
cprintf("%d Unknown address - cannot send message.\n",
ERROR+NO_SUCH_USER);
return;
}
- if (e == M_LOCAL) {
+ if (e == MES_LOCAL) {
a = getuser(&tempUS,recp);
if (a!=0) {
- cprintf("%d No such user.\n", ERROR+NO_SUCH_USER);
+ cprintf("%d No such user.\n",
+ ERROR+NO_SUCH_USER);
return;
}
}
}
fclose(fp);
- save_message(CC->temp, recp, 0, e, 0);
+ save_message(CC->temp, recp, "", e, 0);
}
getuser(&CC->usersupp,CC->curr_user);
if ((CC->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != CC->quickroom.QRroomaide)) {
+ && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
+ && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)) {
cprintf("%d Higher access required.\n",
ERROR+HIGHER_ACCESS_REQUIRED);
return;
}
- delnum = atol(delstr);
- if (CC->quickroom.QRflags & QR_MAILBOX) {
- cprintf("%d Can't delete mail.\n",ERROR);
- return;
- }
+ delnum = extract_long(delstr, 0);
/* get room records, obtaining a lock... */
lgetroom(&CC->quickroom,CC->quickroom.QRname);
/* put the message into the target room */
lgetroom(&qtemp, targ);
- get_msglist(&qtemp);
- CC->num_msgs = CC->num_msgs + 1;
- CC->msglist = realloc(CC->msglist, (CC->num_msgs * sizeof(long)) );
- SetMessageInList(CC->num_msgs - 1, num);
- CC->num_msgs = sort_msglist(CC->msglist, CC->num_msgs);
- put_msglist(&qtemp);
+ qtemp.QRhighest = AddMessageToRoom(&qtemp, num);
lputroom(&qtemp, targ);
- cprintf("%d I think this worked, FIX check to make sure\n", OK);
+ cprintf("%d Message moved.\n", OK);
}
projects / citadel.git / blobdiff