X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fmsgbase.c;h=40d1c8e5b6083e0321b435f0a56983bf40d763ac;hb=531c6449f1d765f5c871ba9d20a13e104d1f5529;hp=8a709492334a0d88cb3c586efefdb81b21964c8c;hpb=6ce0d284993145869a896e5790e9b8250203f1c7;p=citadel.git diff --git a/citadel/server/msgbase.c b/citadel/server/msgbase.c index 8a7094923..40d1c8e5b 100644 --- a/citadel/server/msgbase.c +++ b/citadel/server/msgbase.c @@ -52,7 +52,7 @@ char *msgkeys[] = { "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 @@ -121,7 +121,7 @@ eMsgField FieldOrder[] = { eSuppressIdx , eExtnotify , // Message text (MUST be last) - eMesageText + eMessageText // Not saved to disk: // eVltMsgNum // @@ -1102,14 +1102,14 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) { // 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); @@ -1488,7 +1488,7 @@ int CtdlOutputMsg(long msg_num, // message number (local) to fetch 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 ); @@ -1580,7 +1580,7 @@ void OutputCtdlMsgHeaders(struct CtdlMessage *TheMessage, int do_proto) { 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]); @@ -1712,7 +1712,7 @@ void OutputRFC822MsgHeaders( case eExclusiveID: case eJournal: - case eMesageText: + case eMessageText: case eBig_message: case eOriginalRoom: case eErrorMsg: @@ -1748,7 +1748,7 @@ void Dump_RFC822HeadersBody( char *mptr; int lfSent = 0; - mptr = TheMessage->cm_fields[eMesageText]; + mptr = TheMessage->cm_fields[eMessageText]; prev_ch = '\0'; while (*mptr != '\0') { @@ -1823,7 +1823,7 @@ void DumpFormatFixed( 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"); @@ -1937,7 +1937,7 @@ int CtdlOutputPreLoadedMsg( } 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) { @@ -1960,7 +1960,7 @@ int CtdlOutputPreLoadedMsg( 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) { @@ -2053,7 +2053,7 @@ START_TEXT: 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), @@ -2095,7 +2095,7 @@ START_TEXT: 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 @@ -2111,15 +2111,15 @@ START_TEXT: 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); } @@ -2301,12 +2301,12 @@ long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply) { 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 @@ -2314,8 +2314,8 @@ long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply) { 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) { @@ -2509,7 +2509,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, // message to save } // 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); } @@ -2523,7 +2523,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, // message to save 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); @@ -2789,7 +2789,7 @@ long quickie_message(char *from, CM_SetField(msg, eMsgSubject, subject); } if (!IsEmptyStr(text)) { - CM_SetField(msg, eMesageText, text); + CM_SetField(msg, eMessageText, text); } long msgnum = CtdlSubmitMsg(msg, recp, room); @@ -3046,13 +3046,13 @@ struct CtdlMessage *CtdlMakeMessageLen( } 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); } } @@ -3319,7 +3319,7 @@ long CtdlWriteObject(char *req_room, // Room to stuff it in 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) {