#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <ctype.h>
#include <string.h>
#include <syslog.h>
}
+/*
+ * Manipulate the "seen msgs" string.
+ */
+void CtdlSetSeen(long target_msgnum, int target_setting) {
+ char newseen[SIZ];
+ struct cdbdata *cdbfr;
+ int i;
+ int is_seen = 0;
+ int was_seen = 1;
+ long lo = (-1L);
+ long hi = (-1L);
+ struct visit vbuf;
+ long *msglist;
+ int num_msgs = 0;
+
+ /* Learn about the user and room in question */
+ get_mm();
+ getuser(&CC->usersupp, CC->curr_user);
+ CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+
+ /* Load the message list */
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ msglist = mallok(cdbfr->len);
+ memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ num_msgs = cdbfr->len / sizeof(long);
+ cdb_free(cdbfr);
+ } else {
+ return; /* No messages at all? No further action. */
+ }
+
+ lprintf(9, "before optimize: %s\n", vbuf.v_seen);
+ strcpy(newseen, "");
+
+ for (i=0; i<num_msgs; ++i) {
+ is_seen = 0;
+
+ if (msglist[i] == target_msgnum) {
+ is_seen = target_setting;
+ }
+ else {
+ if (is_msg_in_mset(vbuf.v_seen, msglist[i])) {
+ is_seen = 1;
+ }
+ }
+
+ if (is_seen == 1) {
+ if (lo < 0L) lo = msglist[i];
+ hi = msglist[i];
+ }
+ if ( ((is_seen == 0) && (was_seen == 1))
+ || ((is_seen == 1) && (i == num_msgs-1)) ) {
+ if ( (strlen(newseen) + 20) > SIZ) {
+ strcpy(newseen, &newseen[20]);
+ newseen[0] = '*';
+ }
+ if (strlen(newseen) > 0) strcat(newseen, ",");
+ if (lo == hi) {
+ sprintf(&newseen[strlen(newseen)], "%ld", lo);
+ }
+ else {
+ sprintf(&newseen[strlen(newseen)], "%ld:%ld",
+ lo, hi);
+ }
+ lo = (-1L);
+ hi = (-1L);
+ }
+ was_seen = is_seen;
+ }
+
+ safestrncpy(vbuf.v_seen, newseen, SIZ);
+ lprintf(9, " after optimize: %s\n", vbuf.v_seen);
+ phree(msglist);
+ CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+}
/*
long thismsg;
struct SuppMsgInfo smi;
struct CtdlMessage *msg;
+ int is_seen;
+ long lastold = 0L;
+ int printed_lastold = 0;
/* Learn about the user and room in question */
get_mm();
}
+ /*
+ * Now begin the traversal.
+ */
if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
GetSuppMsgInfo(&smi, msglist[a]);
if (num_msgs > 0)
for (a = 0; a < num_msgs; ++a) {
thismsg = msglist[a];
- if ((thismsg > 0)
+ is_seen = is_msg_in_mset(vbuf.v_seen, thismsg);
+ if (is_seen) lastold = thismsg;
+ if ((thismsg > 0L)
&& (
(mode == MSGS_ALL)
- || ((mode == MSGS_OLD) && (thismsg <= vbuf.v_lastseen))
- || ((mode == MSGS_NEW) && (thismsg > vbuf.v_lastseen))
- || ((mode == MSGS_NEW) && (thismsg >= vbuf.v_lastseen)
- && (CC->usersupp.flags & US_LASTOLD))
+ || ((mode == MSGS_OLD) && (is_seen))
+ || ((mode == MSGS_NEW) && (!is_seen))
|| ((mode == MSGS_LAST) && (a >= (num_msgs - ref)))
|| ((mode == MSGS_FIRST) && (a < ref))
|| ((mode == MSGS_GT) && (thismsg > ref))
|| ((mode == MSGS_EQ) && (thismsg == ref))
)
) {
+ if ((mode == MSGS_NEW) && (CC->usersupp.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
+ if (CallBack)
+ CallBack(lastold, userdata);
+ printed_lastold = 1;
+ ++num_processed;
+ }
if (CallBack) CallBack(thismsg, userdata);
++num_processed;
}
void cmd_msgs(char *cmdbuf)
{
int mode = 0;
- char which[256];
- char buf[256];
- char tfield[256];
- char tvalue[256];
+ char which[SIZ];
+ char buf[SIZ];
+ char tfield[SIZ];
+ char tvalue[SIZ];
int cm_ref = 0;
int i;
int with_template = 0;
*/
void help_subst(char *strbuf, char *source, char *dest)
{
- char workbuf[256];
+ char workbuf[SIZ];
int p;
while (p = pattern2(strbuf, source), (p >= 0)) {
int old = 0;
CIT_UBYTE ch;
char aaa[140];
- char buffer[256];
+ char buffer[SIZ];
strcpy(aaa, "");
old = 255;
char *ptr;
char *wptr;
size_t wlen;
- CIT_UBYTE ch;
+ CIT_UBYTE ch = 0;
if (!strcasecmp(cbtype, "multipart/alternative")) {
strcpy(ma->prefix, partnum);
wptr = content;
while (wlen--) {
ch = *wptr++;
+ /**********
if (ch==10) cprintf("\r\n");
else cprintf("%c", ch);
+ **********/
+ cprintf("%c", ch);
}
+ if (ch != '\n') cprintf("\n");
}
else if (!strcasecmp(cbtype, "text/html")) {
ptr = html_to_ascii(content, 80, 0);
int do_proto, /* do Citadel protocol responses? */
int crlf /* Use CRLF newlines instead of LF? */
) {
- int i, k;
- char buf[1024];
- CIT_UBYTE ch;
- char allkeys[256];
- char display_name[256];
struct CtdlMessage *TheMessage;
- char *mptr;
- char *nl; /* newline string */
-
- /* 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];
- /* */
+ int retcode;
lprintf(7, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
msg_num, mode);
TheMessage = NULL;
- sprintf(mid, "%ld", msg_num);
- nl = (crlf ? "\r\n" : "\n");
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
if (do_proto) cprintf("%d Not logged in.\n",
ERROR, msg_num);
return(om_no_such_msg);
}
+
+ retcode = CtdlOutputPreLoadedMsg(
+ TheMessage, msg_num, mode,
+ headers_only, do_proto, crlf);
+
+ CtdlFreeMessage(TheMessage);
+ return(retcode);
+}
+
+
+/*
+ * Get a message off disk. (returns om_* values found in msgbase.h)
+ *
+ */
+int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
+ long msg_num,
+ int mode, /* how would you like that message? */
+ int headers_only, /* eschew the message body? */
+ int do_proto, /* do Citadel protocol responses? */
+ int crlf /* Use CRLF newlines instead of LF? */
+) {
+ int i, k;
+ char buf[1024];
+ CIT_UBYTE ch;
+ char allkeys[SIZ];
+ char display_name[SIZ];
+ char *mptr;
+ char *nl; /* newline string */
+
+ /* buffers needed for RFC822 translation */
+ char suser[SIZ];
+ char luser[SIZ];
+ char fuser[SIZ];
+ char snode[SIZ];
+ char lnode[SIZ];
+ char mid[SIZ];
+ char datestamp[SIZ];
+ /* */
+
+ sprintf(mid, "%ld", msg_num);
+ nl = (crlf ? "\r\n" : "\n");
+
+ if (!is_valid_message(TheMessage)) {
+ lprintf(1, "ERROR: invalid preloaded message for output\n");
+ return(om_no_such_msg);
+ }
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
} else {
/* Parse the message text component */
mptr = TheMessage->cm_fields['M'];
- mime_parser(mptr, NULL, *mime_download, NULL, 0);
+ mime_parser(mptr, NULL,
+ *mime_download, NULL, NULL,
+ NULL, 0);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
desired_section);
}
}
- CtdlFreeMessage(TheMessage);
return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
strcpy(luser, mptr);
strcpy(suser, mptr);
}
+/****
+ "Path:" removed for now because it confuses brain-dead Microsoft shitware
+ into thinking that mail messages are newsgroup messages instead. When we
+ add NNTP support back into Citadel we'll have to add code to only output
+ this field when appropriate.
else if (i == 'P') {
cprintf("Path: %s%s", mptr, nl);
}
+ ****/
else if (i == 'U')
cprintf("Subject: %s%s", mptr, nl);
else if (i == 'I')
/* Tell the client about the MIME parts in this message */
if (TheMessage->cm_format_type == FMT_RFC822) {
if (mode == MT_CITADEL) {
- mime_parser(mptr, NULL, *list_this_part, NULL, 0);
+ mime_parser(mptr, NULL,
+ *list_this_part, NULL, NULL,
+ NULL, 0);
}
else if (mode == MT_MIME) { /* list parts only */
- mime_parser(mptr, NULL, *list_this_part, NULL, 0);
+ mime_parser(mptr, NULL,
+ *list_this_part, NULL, NULL,
+ NULL, 0);
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
else cprintf("%c", ch);
}
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
}
if (headers_only) {
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
if (TheMessage->cm_format_type == FMT_RFC822) {
CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info));
memset(ma, 0, sizeof(struct ma_info));
- mime_parser(mptr, NULL, *fixed_output, NULL, 0);
+ mime_parser(mptr, NULL,
+ *fixed_output, NULL, NULL,
+ NULL, 0);
}
/* now we're done */
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
{
long msgid;
- CtdlAllocUserData(SYM_DESIRED_SECTION, 256);
+ CtdlAllocUserData(SYM_DESIRED_SECTION, SIZ);
msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
{
long newmsgid;
long retval;
- char msgidbuf[256];
+ char msgidbuf[SIZ];
struct ser_ret smr;
/* Get a new message number */
}
/* Write our little bundle of joy into the message base */
- begin_critical_section(S_MSGMAIN);
if (cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
smr.ser, smr.len) < 0) {
lprintf(2, "Can't store message\n");
} else {
retval = newmsgid;
}
- end_critical_section(S_MSGMAIN);
/* If the caller specified that a copy should be saved to a particular
* file handle, do that now too.
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
char force_room[ROOMNAMELEN];
- char content_type[256]; /* We have to learn this */
- char recipient[256];
+ char content_type[SIZ]; /* We have to learn this */
+ char recipient[SIZ];
long newmsgid;
char *mptr = NULL;
struct usersupp userbuf;
/* advance past header fields */
mptr = msg->cm_fields['M'];
a = strlen(mptr);
- while (--a) {
+ while ((--a) > 0) {
if (!strncasecmp(mptr, "Content-type: ", 14)) {
safestrncpy(content_type, mptr,
sizeof(content_type));
char *exist /* if non-null, append to it;
exist is ALWAYS freed */
) {
- char buf[256];
+ char buf[SIZ];
+ int linelen;
size_t message_len = 0;
size_t buffer_len = 0;
- char *ptr, *append;
+ char *ptr;
char *m;
if (exist == NULL) {
message_len = 0;
}
/* read in the lines of message text one by one */
- append = NULL;
while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) {
+ /* strip trailing newline type stuff */
+ if (buf[strlen(buf)-1]==10) buf[strlen(buf)-1]=0;
+ if (buf[strlen(buf)-1]==13) buf[strlen(buf)-1]=0;
+
+ linelen = strlen(buf);
+
/* augment the buffer if we have to */
- if ((message_len + strlen(buf) + 2) > buffer_len) {
+ if ((message_len + linelen + 2) > buffer_len) {
lprintf(9, "realloking\n");
ptr = reallok(m, (buffer_len * 2) );
if (ptr == NULL) { /* flush if can't allocate */
} else {
buffer_len = (buffer_len * 2);
m = ptr;
- append = NULL;
lprintf(9, "buffer_len is %d\n", buffer_len);
}
}
- if (append == NULL) append = m;
- while (strlen(append) > 0) ++append;
- strcpy(append, buf);
- strcat(append, "\n");
- message_len = message_len + strlen(buf) + 1;
+ /* Add the new line to the buffer. We avoid using strcat()
+ * because that would involve traversing the entire message
+ * after each line, and this function needs to run fast.
+ */
+ strcpy(&m[message_len], buf);
+ m[message_len + linelen] = '\n';
+ m[message_len + linelen + 1] = 0;
+ message_len = message_len + linelen + 1;
/* if we've hit the max msg length, flush the rest */
if (message_len >= maxlen) {
- while ( (client_gets(buf)>0) && strcmp(buf, terminator)) ;;
+ while ( (client_gets(buf)>0)
+ && strcmp(buf, terminator)) ;;
return(m);
}
}
int a;
char dest_node[32];
- char buf[256];
+ char buf[SIZ];
struct CtdlMessage *msg;
msg = mallok(sizeof(struct CtdlMessage));
}
+/*
+ * Check to see whether we have permission to post a message in the current
+ * room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or
+ * returns 0 on success.
+ */
+int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf) {
+
+ if (!(CC->logged_in)) {
+ sprintf(errmsgbuf, "Not logged in.");
+ return (ERROR + NOT_LOGGED_IN);
+ }
+
+ if ((CC->usersupp.axlevel < 2)
+ && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)) {
+ sprintf(errmsgbuf, "Need to be validated to enter "
+ "(except in %s> to sysop)", MAILROOM);
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ if ((CC->usersupp.axlevel < 4)
+ && (CC->quickroom.QRflags & QR_NETWORK)) {
+ sprintf(errmsgbuf, "Need net privileges to enter here.");
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ if ((CC->usersupp.axlevel < 6)
+ && (CC->quickroom.QRflags & QR_READONLY)) {
+ sprintf(errmsgbuf, "Sorry, this is a read-only room.");
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ strcpy(errmsgbuf, "Ok");
+ return(0);
+}
+
void cmd_ent0(char *entargs)
{
int post = 0;
- char recipient[256];
+ char recipient[SIZ];
int anon_flag = 0;
int format_type = 0;
- char newusername[256];
+ char newusername[SIZ];
struct CtdlMessage *msg;
int a, b;
int e = 0;
int mtsflag = 0;
struct usersupp tempUS;
- char buf[256];
+ char buf[SIZ];
+ int err = 0;
post = extract_int(entargs, 0);
extract(recipient, entargs, 1);
/* first check to make sure the request is valid. */
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if ((CC->usersupp.axlevel < 2) && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)) {
- cprintf("%d Need to be validated to enter ",
- ERROR + HIGHER_ACCESS_REQUIRED);
- cprintf("(except in %s> to sysop)\n", MAILROOM);
+ err = CtdlDoIHavePermissionToPostInThisRoom(buf);
+ if (err) {
+ cprintf("%d %s\n", err, buf);
return;
}
- if ((CC->usersupp.axlevel < 4) && (CC->quickroom.QRflags & QR_NETWORK)) {
- cprintf("%d Need net privileges to enter here.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
- if ((CC->usersupp.axlevel < 6) && (CC->quickroom.QRflags & QR_READONLY)) {
- cprintf("%d Sorry, this is a read-only room.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
- mtsflag = 0;
+ /* Check some other permission type things. */
if (post == 2) {
if (CC->usersupp.axlevel < 6) {
*/
void cmd_ent3(char *entargs)
{
- char recp[256];
+ char recp[SIZ];
int a;
int e = 0;
int valid_msg = 1;
+/*
+ * Check whether the current user has permission to delete messages from
+ * the current room (returns 1 for yes, 0 for no)
+ */
+int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) {
+ getuser(&CC->usersupp, CC->curr_user);
+ if ((CC->usersupp.axlevel < 6)
+ && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
+ && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)
+ && (!(CC->internal_pgm))) {
+ return(0);
+ }
+ return(1);
+}
+
+
+
/*
* Delete message from current room
*/
long delnum;
int num_deleted;
- getuser(&CC->usersupp, CC->curr_user);
- if ((CC->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
- && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)
- && (!(CC->internal_pgm))) {
+ if (CtdlDoIHavePermissionToDeleteMessagesFromThisRoom() == 0) {
cprintf("%d Higher access required.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
+/*
+ * Back end API function for moves and deletes
+ */
+int CtdlCopyMsgToRoom(long msgnum, char *dest) {
+ int err;
+
+ err = CtdlSaveMsgPointerInRoom(dest, msgnum,
+ (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ if (err != 0) return(err);
+
+ return(0);
+}
+
+
+
/*
* move or copy a message to another room
*/
void cmd_move(char *args)
{
long num;
- char targ[256];
+ char targ[SIZ];
struct quickroom qtemp;
int err;
int is_copy = 0;
return;
}
- err = CtdlSaveMsgPointerInRoom(targ, num,
- (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ err = CtdlCopyMsgToRoom(num, targ);
if (err != 0) {
cprintf("%d Cannot store message in %s: error %d\n",
err, targ, err);
FILE *fp, *tempfp;
char filename[PATH_MAX];
- char cmdbuf[256];
+ char cmdbuf[SIZ];
char ch;
struct quickroom qrbuf;
char roomname[ROOMNAMELEN];
/* Create the requested room if we have to. */
if (getroom(&qrbuf, roomname) != 0) {
create_room(roomname,
- ( (is_mailbox != NULL) ? 4 : 3 ),
- "", 0);
+ ( (is_mailbox != NULL) ? 5 : 3 ),
+ "", 0, 1);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
long msgnum;
char *conf;
struct CtdlMessage *msg;
- char buf[256];
+ char buf[SIZ];
strcpy(hold_rm, CC->quickroom.QRname);
if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) {
projects / citadel.git / blobdiff