return 1;
}
+void CtdlFreeMessageContents(struct CtdlMessage *msg)
+{
+ int i;
+
+ for (i = 0; i < 256; ++i)
+ if (msg->cm_fields[i] != NULL) {
+ free(msg->cm_fields[i]);
+ }
+ msg->cm_magic = 0; /* just in case */
+}
/*
* 'Destructor' for struct CtdlMessage
*/
void CtdlFreeMessage(struct CtdlMessage *msg)
{
- int i;
-
if (is_valid_message(msg) == 0)
{
if (msg != NULL) free (msg);
return;
}
-
- for (i = 0; i < 256; ++i)
- if (msg->cm_fields[i] != NULL) {
- free(msg->cm_fields[i]);
- }
-
- msg->cm_magic = 0; /* just in case */
+ CtdlFreeMessageContents(msg);
free(msg);
}
ptr = html_to_ascii(content, length, 80, 0);
wlen = strlen(ptr);
client_write(ptr, wlen);
- if (ptr[wlen-1] != '\n') {
+ if ((wlen > 0) && (ptr[wlen-1] != '\n')) {
cprintf("\n");
}
free(ptr);
syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
recipient);
if (CtdlGetUser(&userbuf, recipient) == 0) {
- // Add a flag so the Funambol module knows its mail
- msg->cm_fields['W'] = strdup(recipient);
CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
CtdlBumpNewMailCounter(userbuf.usernum);
imsg->cm_fields['A'] = strdup("Citadel");
imsg->cm_fields['J'] = strdup("do not journal");
imsg->cm_fields['M'] = instr; /* imsg owns this memory now */
- imsg->cm_fields['W'] = strdup(recipient);
+ imsg->cm_fields['2'] = strdup(recipient);
CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0);
CtdlFreeMessage(imsg);
}
}
else {
syslog(LOG_DEBUG, "No user <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(config.c_aideroom,
- newmsgid, 0, msg);
+ CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
/* Perform "after save" hooks */
syslog(LOG_DEBUG, "Performing after-save hooks\n");
+ if (msg->cm_fields['3'] != NULL) free(msg->cm_fields['3']);
+ msg->cm_fields['3'] = malloc(20);
+ snprintf(msg->cm_fields['3'], 20, "%ld", newmsgid);
PerformMessageHooks(msg, EVT_AFTERSAVE);
+ free(msg->cm_fields['3']);
+ msg->cm_fields['3'] = NULL;
/* For IGnet mail, we have to save a new copy into the spooler for
* each recipient, with the R and D fields set to the recipient and
msg->cm_fields['E'] = strdup(supplied_euid);
}
- if (references != NULL) {
- if (!IsEmptyStr(references)) {
- msg->cm_fields['W'] = strdup(references);
- }
+ if ((references != NULL) && (!IsEmptyStr(references))) {
+ if (msg->cm_fields['W'] != NULL)
+ free(msg->cm_fields['W']);
+ msg->cm_fields['W'] = strdup(references);
}
if (preformatted_text != NULL) {
*/
void cmd_ent0(char *entargs)
{
+ struct CitContext *CCC = CC;
int post = 0;
char recp[SIZ];
char cc[SIZ];
char subject[SIZ];
int subject_required = 0;
int do_confirm = 0;
+ int verbose_reply = 0;
long msgnum;
int i, j;
char buf[256];
do_confirm = extract_int(entargs, 6);
extract_token(cc, entargs, 7, '|', sizeof cc);
extract_token(bcc, entargs, 8, '|', sizeof bcc);
+ verbose_reply = extract_int(entargs, 9);
switch(CC->room.QRdefaultview) {
case VIEW_NOTES:
case VIEW_WIKI:
/* Check some other permission type things. */
if (IsEmptyStr(newusername)) {
- strcpy(newusername, CC->user.fullname);
+ strcpy(newusername, CCC->user.fullname);
}
- if ( (CC->user.axlevel < AxAideU)
- && (strcasecmp(newusername, CC->user.fullname))
- && (strcasecmp(newusername, CC->cs_inet_fn))
+ if ( (CCC->user.axlevel < AxAideU)
+ && (strcasecmp(newusername, CCC->user.fullname))
+ && (strcasecmp(newusername, CCC->cs_inet_fn))
) {
cprintf("%d You don't have permission to author messages as '%s'.\n",
ERROR + HIGHER_ACCESS_REQUIRED,
}
if (!IsEmptyStr(newuseremail)) {
- if (!strcasecmp(newuseremail, CC->cs_inet_email)) {
+ if (!strcasecmp(newuseremail, CCC->cs_inet_email)) {
newuseremail_ok = 1;
}
- else if (!IsEmptyStr(CC->cs_inet_other_emails)) {
- j = num_tokens(CC->cs_inet_other_emails, '|');
+ else if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
+ j = num_tokens(CCC->cs_inet_other_emails, '|');
for (i=0; i<j; ++i) {
- extract_token(buf, CC->cs_inet_other_emails, i, '|', sizeof buf);
+ extract_token(buf, CCC->cs_inet_other_emails, i, '|', sizeof buf);
if (!strcasecmp(newuseremail, buf)) {
newuseremail_ok = 1;
}
return;
}
- CC->cs_flags |= CS_POSTING;
+ CCC->cs_flags |= CS_POSTING;
/* In mailbox rooms we have to behave a little differently --
* make sure the user has specified at least one recipient. Then
* is the DRAFTS room which does not require recipients
*/
- if ( ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) )
- || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) )
- ) && (strcasecmp(&CC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
- if (CC->user.axlevel < AxProbU) {
+ if ( ( ( (CCC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CCC->room.QRname[11], MAILROOM)) )
+ || ( (CCC->room.QRflags & QR_MAILBOX) && (CCC->curr_view == VIEW_MAILBOX) )
+ ) && (strcasecmp(&CCC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
+ if (CCC->user.axlevel < AxProbU) {
strcpy(recp, "sysop");
strcpy(cc, "");
strcpy(bcc, "");
}
if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) {
- if (CtdlCheckInternetMailPermission(&CC->user)==0) {
+ if (CtdlCheckInternetMailPermission(&CCC->user)==0) {
cprintf("%d You do not have permission "
"to send Internet mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
}
if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
- && (CC->user.axlevel < AxNetU) ) {
+ && (CCC->user.axlevel < AxNetU) ) {
cprintf("%d Higher access required for network mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
free_recipients(valid_to);
if ((RESTRICT_INTERNET == 1)
&& (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0)
- && ((CC->user.flags & US_INTERNET) == 0)
- && (!CC->internal_pgm)) {
+ && ((CCC->user.flags & US_INTERNET) == 0)
+ && (!CCC->internal_pgm)) {
cprintf("%d You don't have access to Internet mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
free_recipients(valid_to);
/* Is this a room which has anonymous-only or anonymous-option? */
anonymous = MES_NORMAL;
- if (CC->room.QRflags & QR_ANONONLY) {
+ if (CCC->room.QRflags & QR_ANONONLY) {
anonymous = MES_ANONONLY;
}
- if (CC->room.QRflags & QR_ANONOPT) {
+ if (CCC->room.QRflags & QR_ANONOPT) {
if (anon_flag == 1) { /* only if the user requested it */
anonymous = MES_ANONOPT;
}
}
- if ((CC->room.QRflags & QR_MAILBOX) == 0) {
+ if ((CCC->room.QRflags & QR_MAILBOX) == 0) {
recp[0] = 0;
}
* strongly recommended in this room, if either the SUBJECTREQ flag
* is set, or if there is one or more Internet email recipients.
*/
- if (CC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
+ if (CCC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
if ((valid_to) && (valid_to->num_internet > 0)) subject_required = 1;
if ((valid_cc) && (valid_cc->num_internet > 0)) subject_required = 1;
if ((valid_bcc) && (valid_bcc->num_internet > 0)) subject_required = 1;
cprintf("%d send message\n", SEND_LISTING);
}
- msg = CtdlMakeMessage(&CC->user, recp, cc,
- CC->room.QRname, anonymous, format_type,
+ msg = CtdlMakeMessage(&CCC->user, recp, cc,
+ CCC->room.QRname, anonymous, format_type,
newusername, newuseremail, subject,
((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL),
NULL, references);
if (msg != NULL) {
msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+ if (verbose_reply)
+ {
+ if (StrLength(CCC->StatusMessage)>0)
+ {
+ StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n000\n"), 0);
+ cputbuf(CCC->StatusMessage);
+ }
+ else
+ client_write(HKEY("\n000\n"));
+ }
if (do_confirm) {
cprintf("%ld\n", msgnum);
if (msgnum >= 0L) {
- cprintf("Message accepted.\n");
+ client_write(HKEY("Message accepted.\n"));
}
else {
- cprintf("Internal error.\n");
+ client_write(HKEY("Internal error.\n"));
}
if (msg->cm_fields['E'] != NULL) {
cprintf("%s\n", msg->cm_fields['E']);