eJournal = 'J',
eReplyTo = 'K',
eListID = 'L',
- eMesageText = 'M',
+ eMessageText = 'M',
eOriginalRoom = 'O',
eMessagePath = 'P',
eRecipient = 'R',
else {
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
- conf = strdup(msg->cm_fields[eMesageText]);
+ conf = strdup(msg->cm_fields[eMessageText]);
CM_Free(msg);
}
else {
if (pos < totalend)
StrBufAppendBufPlain(OtherHeaders, pos, totalend - pos, 0);
FreeStrBuf(rfc822);
- CM_SetAsFieldSB(msg, eMesageText, &OtherHeaders);
+ CM_SetAsFieldSB(msg, eMessageText, &OtherHeaders);
// Follow-up sanity checks...
StrBufAppendBufPlain(message_text, mime_boundary, mblen, 0);
StrBufAppendBufPlain(message_text, HKEY("--\r\n"), 0);
- CM_SetAsFieldSB(journal_msg, eMesageText, &message_text);
+ CM_SetAsFieldSB(journal_msg, eMessageText, &message_text);
free(jmsg->rfc822);
free(jmsg->msgn);
jmsg->rfc822 = NULL;
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- v = vcard_load(msg->cm_fields[eMesageText]);
+ v = vcard_load(msg->cm_fields[eMessageText]);
CM_Free(msg);
// Try to match from a friendly name (the "fn" field). If there is
StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0);
StrBufAppendBufPlain(MsgBody, ser, serlen, 0);
- CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
+ CM_SetAsFieldSB(msg, eMessageText, &MsgBody);
// Now write the data
CtdlSubmitMsg(msg, NULL, "");
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, partnum);
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_locate_part, // callback function
NULL,
NULL,
}
oec.c = NULL;
mime_parser(
- CM_RANGE(msg, eMesageText),
+ CM_RANGE(msg, eMessageText),
*ical_locate_original_event, // callback function
NULL, NULL,
&oec, // user data
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, partnum);
mime_parser(
- CM_RANGE(msg, eMesageText),
+ CM_RANGE(msg, eMessageText),
*ical_locate_part, // callback function
NULL,
NULL,
if (msg == NULL) return;
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, "_HUNT_");
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_locate_part, // callback function
NULL,
NULL,
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, partnum);
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_locate_part, /* callback function */
NULL, NULL,
(void *) &ird, /* user data */
if (msg == NULL) return;
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, "_HUNT_");
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_locate_part, /* callback function */
NULL, NULL,
(void *) &ird, /* user data */
if (msg == NULL) return;
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, "_HUNT_");
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_locate_part, /* callback function */
NULL, NULL,
(void *) &ird, /* user data */
return(1); /* You tried to save a non-RFC822 message! */
}
- if (CM_IsEmpty(msg, eMesageText)) {
+ if (CM_IsEmpty(msg, eMessageText)) {
return(1); /* You tried to save a null message! */
}
/* Do all of our lovely back-end parsing */
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_obj_beforesave_backend,
NULL, NULL,
(void *)msg,
if (msg->cm_format_type != 4) return(1);
// Reject null messages
- if (CM_IsEmpty(msg, eMesageText)) return(1);
+ if (CM_IsEmpty(msg, eMessageText)) return(1);
// Now recurse through it looking for our icalendar data
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*ical_obj_aftersave_backend,
NULL, NULL,
NULL,
imap_output_envelope_from(msg);
/* Sender (default to same as 'From' if not present) */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Sender");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Sender");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
free(fieldptr);
}
/* Reply-to */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Reply-to");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Reply-to");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
free(fieldptr);
imap_output_envelope_addr(fieldptr);
}
else {
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Cc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Cc");
imap_output_envelope_addr(fieldptr);
if (fieldptr != NULL) free(fieldptr);
}
/* Bcc */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Bcc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Bcc");
imap_output_envelope_addr(fieldptr);
if (fieldptr != NULL) free(fieldptr);
/* In-reply-to */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "In-reply-to");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "In-reply-to");
IPutStr(fieldptr, (fieldptr)?strlen(fieldptr):0);
IAPuts(" ");
if (fieldptr != NULL) free(fieldptr);
* (Note value of 1 passed as 'dont_decode' so client gets it encoded)
*/
else {
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*imap_load_part, NULL, NULL,
section,
1
/* For messages already stored in RFC822 format, we have to parse. */
IAPuts("BODYSTRUCTURE ");
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*imap_fetch_bodystructure_part, /* part */
*imap_fetch_bodystructure_pre, /* pre-multi */
*imap_fetch_bodystructure_post, /* post-multi */
need_to_free_msg = 1;
}
if (msg != NULL) {
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Bcc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Bcc");
if (fieldptr != NULL) {
if (bmstrcasestr(fieldptr, itemlist[pos+1].Key)) {
match = 1;
need_to_free_msg = 1;
}
if (msg != NULL) {
- if (bmstrcasestr(msg->cm_fields[eMesageText], itemlist[pos+1].Key)) {
+ if (bmstrcasestr(msg->cm_fields[eMessageText], itemlist[pos+1].Key)) {
match = 1;
}
}
}
}
else {
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Cc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Cc");
if (fieldptr != NULL) {
if (bmstrcasestr(fieldptr, itemlist[pos+1].Key)) {
match = 1;
need_to_free_msg = 1;
}
if (msg != NULL) {
- if (msg->cm_lengths[eMesageText] > atoi(itemlist[pos+1].Key)) {
+ if (msg->cm_lengths[eMessageText] > atoi(itemlist[pos+1].Key)) {
match = 1;
}
}
need_to_free_msg = 1;
}
if (msg != NULL) {
- if (msg->cm_lengths[eMesageText] < atoi(itemlist[pos+1].Key)) {
+ if (msg->cm_lengths[eMessageText] < atoi(itemlist[pos+1].Key)) {
match = 1;
}
}
break;
case field_xspamstatus:
- if (!IsEmptyStr(msg->cm_fields[eMesageText])) {
- if ((ptr=strstr(msg->cm_fields[eMesageText],"X-Spam-Status"))!=NULL) {
+ if (!IsEmptyStr(msg->cm_fields[eMessageText])) {
+ if ((ptr=strstr(msg->cm_fields[eMessageText],"X-Spam-Status"))!=NULL) {
len=0;
ptr1=ptr;
while (*ptr1 && (*ptr1!='\r') && (*ptr1!='\n')) {
return; // config msgnum is set but that message does not exist
}
- ii = deserialize_inbox_rules(msg->cm_fields[eMesageText]);
+ ii = deserialize_inbox_rules(msg->cm_fields[eMessageText]);
CM_Free(msg);
if (ii == NULL) {
struct CtdlMessage *msg = CtdlFetchMessage(CC->user.msgnum_inboxrules, 1);
if (msg != NULL) {
- if (!CM_IsEmpty(msg, eMesageText)) {
+ if (!CM_IsEmpty(msg, eMessageText)) {
char *token;
- char *rest = msg->cm_fields[eMesageText];
+ char *rest = msg->cm_fields[eMessageText];
while ((token = strtok_r(rest, "\n", &rest))) {
// for backwards compatibility, "# WEBCIT_RULE" is an alias for "rule"
char *conf;
char buf[SIZ];
- if (CM_IsEmpty(msg, eMesageText)) return;
- conf = strdup(msg->cm_fields[eMesageText]);
+ if (CM_IsEmpty(msg, eMessageText)) return;
+ conf = strdup(msg->cm_fields[eMessageText]);
if (conf != NULL) {
do {
return(0);
}
- ptr = msg->cm_fields[eMesageText];
+ ptr = msg->cm_fields[eMessageText];
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
}
CM_SetField(msg, eOriginalRoom, PAGELOGROOM);
- CM_SetAsFieldSB(msg, eMesageText, &FullMsgBuf); /* we own this memory now */
+ CM_SetAsFieldSB(msg, eMessageText, &FullMsgBuf); /* we own this memory now */
// Start with usernums[1] because it's guaranteed to be higher than usernums[0],
// so if there's only one party, usernums[0] will be zero but usernums[1] won't.
* any existing message containing that UUID.
*/
strcpy(uuid, "");
- p = msg->cm_fields[eMesageText];
- a = msg->cm_lengths[eMesageText];
+ p = msg->cm_fields[eMessageText];
+ a = msg->cm_lengths[eMessageText];
while (--a > 0) {
if (!strncasecmp(p, "X-KOrg-Note-Id: ", 16)) { /* Found it */
safestrncpy(uuid, p + 16, sizeof(uuid));
/* Modern clients are using vNote format. Check for one... */
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*notes_extract_vnote,
NULL, NULL,
&v, /* user data ptr - put the vnote here */
StrBufAppendBuf(TheMessage, TheMessage_Encoded, 0);
FreeStrBuf(&TheMessage_Encoded);
- CM_SetField(r->msg, eMesageText, ChrPtr(TheMessage));
+ CM_SetField(r->msg, eMessageText, ChrPtr(TheMessage));
FreeStrBuf(&TheMessage);
if (CM_IsEmpty(r->msg, eAuthor)) {
if ( !CM_IsEmpty(msg, eMsgSubject) && (!strcasecmp(msg->cm_fields[eMsgSubject], "__ WebCit Preferences __"))) {
// This is it! Change ownership of the message text so it doesn't get freed.
- *webcit_conf = (char *)msg->cm_fields[eMesageText];
- msg->cm_fields[eMesageText] = NULL;
+ *webcit_conf = (char *)msg->cm_fields[eMessageText];
+ msg->cm_fields[eMessageText] = NULL;
}
CM_Free(msg);
}
CM_SetField(imsg, eMsgSubject, "QMSG");
CM_SetField(imsg, eAuthor, "Citadel");
CM_SetField(imsg, eJournal, "do not journal");
- CM_SetAsFieldSB(imsg, eMesageText, &SpoolMsg);
+ CM_SetAsFieldSB(imsg, eMessageText, &SpoolMsg);
last_queue_job_submitted = CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
CM_Free(imsg);
}
return;
}
- instr = msg->cm_fields[eMesageText];
- msg->cm_fields[eMesageText] = NULL;
+ instr = msg->cm_fields[eMessageText];
+ msg->cm_fields[eMessageText] = NULL;
CM_Free(msg);
// if the queue job message has any CRLF's convert them to LF's
StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
StrBufAppendBuf(BounceMB, boundary, 0);
StrBufAppendBufPlain(BounceMB, HKEY("--\r\n"), 0);
- CM_SetAsFieldSB(bmsg, eMesageText, &BounceMB);
+ CM_SetAsFieldSB(bmsg, eMessageText, &BounceMB);
/* Deliver the bounce if there's anything worth mentioning */
syslog(LOG_DEBUG, "num_bounces = %d", num_bounces);
"\r\nX-Spam-Status: %s, score=%s required=%s\r\n",
sastatus, sascore, saoutof);
- CM_PrependToField(msg, eMesageText, buf, headerlen);
+ CM_PrependToField(msg, eMessageText, buf, headerlen);
}
else {
// Ok, if we got this far, look into the situation further...
- if (CM_IsEmpty(msg, eMesageText)) return(0);
+ if (CM_IsEmpty(msg, eMessageText)) return(0);
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*vcard_extract_vcard,
NULL, NULL,
&v, // user data ptr - put the vcard here
StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
StrBufAppendBufPlain(buf, ser, serlen, 0);
StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
- CM_SetAsFieldSB(msg, eMesageText, &buf);
+ CM_SetAsFieldSB(msg, eMessageText, &buf);
free(ser);
}
if (!is_UserConf && !is_GAB) return(0);
- if (CM_IsEmpty(msg, eMesageText))
+ if (CM_IsEmpty(msg, eMessageText))
return 0;
- ptr = msg->cm_fields[eMesageText];
+ ptr = msg->cm_fields[eMessageText];
CC->vcard_updated_by_ldap=0; /* As this will write LDAP's previous changes, disallow LDAP change auth until next LDAP change. */
/* Store our friendly/display name in memory */
if (is_MY_UserConf) {
- v = vcard_load(msg->cm_fields[eMesageText]);
+ v = vcard_load(msg->cm_fields[eMessageText]);
extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
vcard_free(v);
}
msg = CtdlFetchMessage(VCmsgnum, 1);
if (msg == NULL) return vcard_new();
- v = vcard_load(msg->cm_fields[eMesageText]);
+ v = vcard_load(msg->cm_fields[eMessageText]);
CM_Free(msg);
return v;
}
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*dvca_mime_callback, /* callback function */
NULL, NULL,
NULL, /* user data */
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- v = vcard_load(msg->cm_fields[eMesageText]);
+ v = vcard_load(msg->cm_fields[eMessageText]);
CM_Free(msg);
i = 0;
StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
StrBufAppendBufPlain(buf, ser, serlen, 0);
StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
- CM_SetAsFieldSB(vmsg, eMesageText, &buf);
+ CM_SetAsFieldSB(vmsg, eMessageText, &buf);
free(ser);
}
vcard_free(v);
}
/* If there's no message text, obviously this is all b0rken and shouldn't happen at all */
- if (CM_IsEmpty(msg, eMesageText)) return(0);
+ if (CM_IsEmpty(msg, eMessageText)) return(0);
/* Set the message subject identical to the page name */
CM_CopyField(msg, eMsgSubject, eExclusiveID);
old_msg = NULL;
}
- if ((old_msg != NULL) && (CM_IsEmpty(old_msg, eMesageText))) { /* old version is corrupt? */
+ if ((old_msg != NULL) && (CM_IsEmpty(old_msg, eMessageText))) { /* old version is corrupt? */
CM_Free(old_msg);
old_msg = NULL;
}
/* If no changes were made, don't bother saving it again */
- if ((old_msg != NULL) && (!strcmp(msg->cm_fields[eMesageText], old_msg->cm_fields[eMesageText]))) {
+ if ((old_msg != NULL) && (!strcmp(msg->cm_fields[eMessageText], old_msg->cm_fields[eMessageText]))) {
CM_Free(old_msg);
return(1);
}
if (old_msg != NULL) {
fp = fopen(diff_old_filename, "w");
- rv = fwrite(old_msg->cm_fields[eMesageText], old_msg->cm_lengths[eMesageText], 1, fp);
+ rv = fwrite(old_msg->cm_fields[eMessageText], old_msg->cm_lengths[eMessageText], 1, fp);
fclose(fp);
CM_Free(old_msg);
}
fp = fopen(diff_new_filename, "w");
- rv = fwrite(msg->cm_fields[eMesageText], msg->cm_lengths[eMesageText], 1, fp);
+ rv = fwrite(msg->cm_fields[eMessageText], msg->cm_lengths[eMessageText], 1, fp);
fclose(fp);
snprintf(diff_cmd, sizeof diff_cmd,
"--%s--\n",
boundary, boundary
);
- CM_SetAsField(history_msg, eMesageText, &buf, len);
+ CM_SetAsField(history_msg, eMessageText, &buf, len);
}
/* Update the history message (regardless of whether it's new or existing) */
*/
*boundary = '\0';
- ptr = history_msg->cm_fields[eMesageText];
+ ptr = history_msg->cm_fields[eMessageText];
do {
ptr = memreadline(ptr, buf, sizeof buf);
if (*ptr != 0) {
snprintf(prefixed_boundary, sizeof(prefixed_boundary), "--%s", boundary);
- CM_GetAsField(history_msg, eMesageText, &MsgText, &MsgTextLen);
+ CM_GetAsField(history_msg, eMessageText, &MsgText, &MsgTextLen);
ptr = bmstrcasestr(MsgText, prefixed_boundary);
if (ptr != NULL) {
StrBufAppendBufPlain(NewMsgText, ptr, MsgTextLen - (ptr - MsgText), 0);
free(MsgText);
- CM_SetAsFieldSB(history_msg, eMesageText, &NewMsgText);
+ CM_SetAsFieldSB(history_msg, eMessageText, &NewMsgText);
}
else {
- CM_SetAsField(history_msg, eMesageText, &MsgText, MsgTextLen);
+ CM_SetAsField(history_msg, eMessageText, &MsgText, MsgTextLen);
}
CM_SetFieldLONG(history_msg, eTimestamp, Now);
msg = NULL;
}
- if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+ if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
CM_Free(msg);
msg = NULL;
}
cprintf("%d Revision history for '%s'\n", LISTING_FOLLOWS, pagename);
- mime_parser(CM_RANGE(msg, eMesageText), *wiki_history_callback, NULL, NULL, NULL, 0);
+ mime_parser(CM_RANGE(msg, eMessageText), *wiki_history_callback, NULL, NULL, NULL, 0);
cprintf("000\n");
CM_Free(msg);
msg = NULL;
}
- if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+ if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
CM_Free(msg);
msg = NULL;
}
CtdlMakeTempFileName(temp, sizeof temp);
fp = fopen(temp, "w");
if (fp != NULL) {
- r = fwrite(msg->cm_fields[eMesageText], msg->cm_lengths[eMesageText], 1, fp);
+ r = fwrite(msg->cm_fields[eMessageText], msg->cm_lengths[eMessageText], 1, fp);
fclose(fp);
}
else {
msg = NULL;
}
- if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) {
+ if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) {
CM_Free(msg);
msg = NULL;
}
hecbd.stop_when = rev;
string_trim(hecbd.stop_when);
- mime_parser(CM_RANGE(msg, eMesageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
+ mime_parser(CM_RANGE(msg, eMessageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
CM_Free(msg);
/* Were we successful? */
rv = fread(msgbuf, len, 1, fp);
syslog(LOG_DEBUG, "did %d blocks of %ld bytes\n", rv, len);
msgbuf[len] = '\0';
- CM_SetAsField(msg, eMesageText, &msgbuf, len);
+ CM_SetAsField(msg, eMessageText, &msgbuf, len);
fclose(fp);
}
if (len <= 0) {
/* now add anyone we find into the hashlist */
/* skip past the headers */
- ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
+ ptr = strstr(msg->cm_fields[eMessageText], "\n\n");
if (ptr != NULL) {
ptr += 2;
}
else {
- ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
+ ptr = strstr(msg->cm_fields[eMessageText], "\n\r\n");
if (ptr != NULL) {
ptr += 3;
}
"jrnl", // J -> eJournal
"rep2", // K -> eReplyTo
"list", // L -> eListID
- "text", // M -> eMesageText
+ "text", // M -> eMessageText
NULL, // N (formerly used as eNodename)
"room", // O -> eOriginalRoom
"path", // P -> eMessagePath
eSuppressIdx ,
eExtnotify ,
// Message text (MUST be last)
- eMesageText
+ eMessageText
// Not saved to disk:
// eVltMsgNum
//
// so go ahead and fetch that. Failing that, just set a dummy
// body so other code doesn't barf.
//
- if ( (CM_IsEmpty(ret, eMesageText)) && (with_body) ) {
+ if ( (CM_IsEmpty(ret, eMessageText)) && (with_body) ) {
dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long));
if (dmsgtext.ptr != NULL) {
- CM_SetField(ret, eMesageText, dmsgtext.ptr);
+ CM_SetField(ret, eMessageText, dmsgtext.ptr);
}
}
- if (CM_IsEmpty(ret, eMesageText)) {
- CM_SetField(ret, eMesageText, "\r\n\r\n (no text)\r\n");
+ if (CM_IsEmpty(ret, eMessageText)) {
+ CM_SetField(ret, eMessageText, "\r\n\r\n (no text)\r\n");
}
return (ret);
if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) {
memset(&encap, 0, sizeof encap);
safestrncpy(encap.desired_section, section, sizeof encap.desired_section);
- mime_parser(CM_RANGE(TheMessage, eMesageText),
+ mime_parser(CM_RANGE(TheMessage, eMessageText),
*extract_encapsulated_message,
NULL, NULL, (void *)&encap, 0
);
for (i=0; i< NDiskFields; ++i) {
eMsgField Field;
Field = FieldOrder[i];
- if (Field != eMesageText) {
+ if (Field != eMessageText) {
if ( (!CM_IsEmpty(TheMessage, Field)) && (msgkeys[Field] != NULL) ) {
if ((Field == eenVelopeTo) || (Field == eRecipient) || (Field == eCarbonCopY)) {
sanitize_truncated_recipient(TheMessage->cm_fields[Field]);
case eExclusiveID:
case eJournal:
- case eMesageText:
+ case eMessageText:
case eBig_message:
case eOriginalRoom:
case eErrorMsg:
char *mptr;
int lfSent = 0;
- mptr = TheMessage->cm_fields[eMesageText];
+ mptr = TheMessage->cm_fields[eMessageText];
prev_ch = '\0';
while (*mptr != '\0') {
int xlline = 0;
char *mptr;
- mptr = TheMessage->cm_fields[eMesageText];
+ mptr = TheMessage->cm_fields[eMessageText];
if (mode == MT_MIME) {
cprintf("Content-type: text/plain\n\n");
}
else {
// Parse the message text component
- mime_parser(CM_RANGE(TheMessage, eMesageText), *mime_download, NULL, NULL, NULL, 0);
+ mime_parser(CM_RANGE(TheMessage, eMessageText), *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
if (CC->download_fp == NULL) {
else {
// Locate and parse the component specified by the caller
int found_it = 0;
- mime_parser(CM_RANGE(TheMessage, eMesageText), *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
+ mime_parser(CM_RANGE(TheMessage, eMessageText), *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
// If section wasn't found, print an error
if (!found_it) {
if (TheMessage->cm_format_type == FMT_RFC822) {
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
memset(&ma, 0, sizeof(struct ma_info));
- mime_parser(CM_RANGE(TheMessage, eMesageText),
+ mime_parser(CM_RANGE(TheMessage, eMessageText),
(do_proto ? *list_this_part : NULL),
(do_proto ? *list_this_pref : NULL),
(do_proto ? *list_this_suff : NULL),
if (mode == MT_MIME) {
cprintf("Content-type: text/x-citadel-variformat\n\n");
}
- memfmout(TheMessage->cm_fields[eMesageText], nl);
+ memfmout(TheMessage->cm_fields[eMessageText], nl);
}
// If the message on disk is format 4 (MIME), we've gotta hand it
strcpy(ma.chosen_part, "1");
ma.chosen_pref = 9999;
ma.dont_decode = CC->msg4_dont_decode;
- mime_parser(CM_RANGE(TheMessage, eMesageText),
+ mime_parser(CM_RANGE(TheMessage, eMessageText),
*choose_preferred, *fixed_output_pre,
*fixed_output_post, (void *)&ma, 1);
- mime_parser(CM_RANGE(TheMessage, eMesageText),
+ mime_parser(CM_RANGE(TheMessage, eMessageText),
*output_preferred, NULL, NULL, (void *)&ma, 1);
}
else {
ma.use_fo_hooks = 1;
- mime_parser(CM_RANGE(TheMessage, eMesageText),
+ mime_parser(CM_RANGE(TheMessage, eMessageText),
*fixed_output, *fixed_output_pre,
*fixed_output_post, (void *)&ma, 0);
}
long holdMLen = 0;
// If the message is big, set its body aside for storage elsewhere and we hide the message body from the serializer
- if (!CM_IsEmpty(msg, eMesageText) && msg->cm_lengths[eMesageText] > BIGMSG) {
+ if (!CM_IsEmpty(msg, eMessageText) && msg->cm_lengths[eMessageText] > BIGMSG) {
is_bigmsg = 1;
- holdM = msg->cm_fields[eMesageText];
- msg->cm_fields[eMesageText] = NULL;
- holdMLen = msg->cm_lengths[eMesageText];
- msg->cm_lengths[eMesageText] = 0;
+ holdM = msg->cm_fields[eMessageText];
+ msg->cm_fields[eMessageText] = NULL;
+ holdMLen = msg->cm_lengths[eMessageText];
+ msg->cm_lengths[eMessageText] = 0;
}
// Serialize our data structure for storage in the database
if (is_bigmsg) {
// put the message body back into the message
- msg->cm_fields[eMesageText] = holdM;
- msg->cm_lengths[eMesageText] = holdMLen;
+ msg->cm_fields[eMessageText] = holdM;
+ msg->cm_lengths[eMessageText] = holdMLen;
}
if (smr.len == 0) {
}
// Learn about what's inside, because it's what's inside that counts
- if (CM_IsEmpty(msg, eMesageText)) {
+ if (CM_IsEmpty(msg, eMessageText)) {
syslog(LOG_ERR, "msgbase: ERROR; attempt to save message with NULL body");
return(-2);
}
break;
case 4:
strcpy(content_type, "text/plain");
- mptr = bmstrcasestr(msg->cm_fields[eMesageText], "Content-type:");
+ mptr = bmstrcasestr(msg->cm_fields[eMessageText], "Content-type:");
if (mptr != NULL) {
char *aptr;
safestrncpy(content_type, &mptr[13], sizeof content_type);
CM_SetField(msg, eMsgSubject, subject);
}
if (!IsEmptyStr(text)) {
- CM_SetField(msg, eMesageText, text);
+ CM_SetField(msg, eMessageText, text);
}
long msgnum = CtdlSubmitMsg(msg, recp, room);
}
if (preformatted_text != NULL) {
- CM_SetField(msg, eMesageText, preformatted_text);
+ CM_SetField(msg, eMessageText, preformatted_text);
}
else {
StrBuf *MsgBody;
MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0);
if (MsgBody != NULL) {
- CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
+ CM_SetAsFieldSB(msg, eMessageText, &MsgBody);
}
}
CM_SetField(msg, eOriginalRoom, req_room);
msg->cm_flags = flags;
- CM_SetAsFieldSB(msg, eMesageText, &encoded_message);
+ CM_SetAsFieldSB(msg, eMessageText, &encoded_message);
// Create the requested room if we have to.
if (CtdlGetRoom(&qrbuf, roomname) != 0) {
case eXclusivID:
case eJournal:
case eListID:
- case eMesageText:
+ case eMessageText:
case eMessagePath:
case eSpecialField:
case eTimestamp:
eJournal,
eReplyTo,
eListID,
- eMesageText,
+ eMessageText,
eIsLocal,
eMessagePath,
eRecipient,
"jrnl", /* J -> eJournal */
"rep2", /* K -> eReplyTo */
"list", /* L -> eListID */
- "text", /* M -> eMesageText */
+ "text", /* M -> eMessageText */
"locl", /* eIsLocal */
"path", /* P -> eMessagePath */
"rcpt", /* R -> eRecipient */