From: Art Cancro Date: Thu, 4 Jan 2024 22:51:08 +0000 (-0500) Subject: dammit, learn to spell X-Git-Tag: v997~32 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=531c6449f1d765f5c871ba9d20a13e104d1f5529 dammit, learn to spell Many years ago, someone inserted an enum called eMesageText into the code and used it all over the place without correcting the spelling. This commit finally fixes it. --- diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h index eb286fde5..167dcfffb 100644 --- a/citadel/server/citadel_defs.h +++ b/citadel/server/citadel_defs.h @@ -261,7 +261,7 @@ typedef enum _MsgField { eJournal = 'J', eReplyTo = 'K', eListID = 'L', - eMesageText = 'M', + eMessageText = 'M', eOriginalRoom = 'O', eMessagePath = 'P', eRecipient = 'R', diff --git a/citadel/server/config.c b/citadel/server/config.c index fa05c4dfd..44b1c3d97 100644 --- a/citadel/server/config.c +++ b/citadel/server/config.c @@ -439,7 +439,7 @@ char *CtdlGetSysConfig(char *sysconfname) { else { msg = CtdlFetchMessage(msgnum, 1); if (msg != NULL) { - conf = strdup(msg->cm_fields[eMesageText]); + conf = strdup(msg->cm_fields[eMessageText]); CM_Free(msg); } else { diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c index b08123143..f9bd07309 100644 --- a/citadel/server/internet_addressing.c +++ b/citadel/server/internet_addressing.c @@ -1069,7 +1069,7 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822) { 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... diff --git a/citadel/server/journaling.c b/citadel/server/journaling.c index 8a97fd479..cce21fa24 100644 --- a/citadel/server/journaling.c +++ b/citadel/server/journaling.c @@ -195,7 +195,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) { 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; diff --git a/citadel/server/modules/autocompletion/serv_autocompletion.c b/citadel/server/modules/autocompletion/serv_autocompletion.c index f9e4029ce..413bf472b 100644 --- a/citadel/server/modules/autocompletion/serv_autocompletion.c +++ b/citadel/server/modules/autocompletion/serv_autocompletion.c @@ -50,7 +50,7 @@ void hunt_for_autocomplete(long msgnum, char *search_string) { 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 diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c index 13cb1394e..a02426cba 100644 --- a/citadel/server/modules/calendar/serv_calendar.c +++ b/citadel/server/modules/calendar/serv_calendar.c @@ -125,7 +125,7 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { 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, ""); @@ -341,7 +341,7 @@ void ical_respond(long msgnum, char *partnum, char *action) { 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, @@ -572,7 +572,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { } oec.c = NULL; mime_parser( - CM_RANGE(msg, eMesageText), + CM_RANGE(msg, eMessageText), *ical_locate_original_event, // callback function NULL, NULL, &oec, // user data @@ -657,7 +657,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) { 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, @@ -1071,7 +1071,7 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *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, @@ -1138,7 +1138,7 @@ void ical_conflicts(long msgnum, char *partnum) { 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 */ @@ -1315,7 +1315,7 @@ void ical_freebusy_backend(long msgnum, void *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 */ @@ -1512,7 +1512,7 @@ void ical_getics_backend(long msgnum, void *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 */ @@ -2289,12 +2289,12 @@ int ical_obj_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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, @@ -2358,10 +2358,10 @@ int ical_obj_aftersave(struct CtdlMessage *msg, struct recptypes *recp) { 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, diff --git a/citadel/server/modules/imap/imap_fetch.c b/citadel/server/modules/imap/imap_fetch.c index 7d2fe746f..bb8c2458d 100644 --- a/citadel/server/modules/imap/imap_fetch.c +++ b/citadel/server/modules/imap/imap_fetch.c @@ -440,7 +440,7 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { 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); @@ -450,7 +450,7 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { } /* 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); @@ -468,18 +468,18 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { 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); @@ -715,7 +715,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { * (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 @@ -980,7 +980,7 @@ void imap_fetch_bodystructure (long msgnum, const char *item, /* 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 */ diff --git a/citadel/server/modules/imap/imap_search.c b/citadel/server/modules/imap/imap_search.c index 1c70de8ab..c3b3b7ae7 100644 --- a/citadel/server/modules/imap/imap_search.c +++ b/citadel/server/modules/imap/imap_search.c @@ -107,7 +107,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg, 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; @@ -150,7 +150,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg, 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; } } @@ -172,7 +172,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg, } } 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; @@ -263,7 +263,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg, 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; } } @@ -384,7 +384,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg, 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; } } diff --git a/citadel/server/modules/inboxrules/serv_inboxrules.c b/citadel/server/modules/inboxrules/serv_inboxrules.c index e38f38696..5c01625af 100644 --- a/citadel/server/modules/inboxrules/serv_inboxrules.c +++ b/citadel/server/modules/inboxrules/serv_inboxrules.c @@ -610,8 +610,8 @@ void inbox_do_msg(long msgnum, void *userdata) { 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')) { @@ -818,7 +818,7 @@ void do_inbox_processing_for_user(long usernum) { 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) { @@ -930,9 +930,9 @@ void cmd_gibr(char *argbuf) { 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" diff --git a/citadel/server/modules/inetcfg/serv_inetcfg.c b/citadel/server/modules/inetcfg/serv_inetcfg.c index 24a5dd00a..3f606f52c 100644 --- a/citadel/server/modules/inetcfg/serv_inetcfg.c +++ b/citadel/server/modules/inetcfg/serv_inetcfg.c @@ -47,8 +47,8 @@ void inetcfg_setTo(struct CtdlMessage *msg) { 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 { @@ -80,7 +80,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg, struct recptypes *recp) { return(0); } - ptr = msg->cm_fields[eMesageText]; + ptr = msg->cm_fields[eMessageText]; while (ptr != NULL) { linelen = strcspn(ptr, "\n"); diff --git a/citadel/server/modules/instmsg/serv_instmsg.c b/citadel/server/modules/instmsg/serv_instmsg.c index cc9395377..9fcc13fe5 100644 --- a/citadel/server/modules/instmsg/serv_instmsg.c +++ b/citadel/server/modules/instmsg/serv_instmsg.c @@ -414,7 +414,7 @@ void flush_individual_conversation(struct imlog *im) { } 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. diff --git a/citadel/server/modules/notes/serv_notes.c b/citadel/server/modules/notes/serv_notes.c index abc364e7e..dfa3e597e 100644 --- a/citadel/server/modules/notes/serv_notes.c +++ b/citadel/server/modules/notes/serv_notes.c @@ -88,8 +88,8 @@ int serv_notes_beforesave(struct CtdlMessage *msg, struct recptypes *recp) * 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)); @@ -112,7 +112,7 @@ int serv_notes_beforesave(struct CtdlMessage *msg, struct recptypes *recp) /* 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 */ diff --git a/citadel/server/modules/rssclient/serv_rssclient.c b/citadel/server/modules/rssclient/serv_rssclient.c index c1688cfd0..995bd87da 100644 --- a/citadel/server/modules/rssclient/serv_rssclient.c +++ b/citadel/server/modules/rssclient/serv_rssclient.c @@ -150,7 +150,7 @@ void rss_end_element(void *data, const char *el) { 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)) { diff --git a/citadel/server/modules/smtp/serv_smtp.c b/citadel/server/modules/smtp/serv_smtp.c index f5bcab98c..e58c4ff6f 100644 --- a/citadel/server/modules/smtp/serv_smtp.c +++ b/citadel/server/modules/smtp/serv_smtp.c @@ -248,8 +248,8 @@ void smtp_webcit_preferences_hack_backend(long msgnum, void *userdata) { 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); } diff --git a/citadel/server/modules/smtp/serv_smtpclient.c b/citadel/server/modules/smtp/serv_smtpclient.c index 6c1b9cc84..edce1f5c3 100644 --- a/citadel/server/modules/smtp/serv_smtpclient.c +++ b/citadel/server/modules/smtp/serv_smtpclient.c @@ -108,7 +108,7 @@ int smtp_aftersave(struct CtdlMessage *msg, struct recptypes *recps) { 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); } @@ -327,8 +327,8 @@ void smtp_process_one_msg(long qmsgnum) { 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 diff --git a/citadel/server/modules/smtp/smtp_util.c b/citadel/server/modules/smtp/smtp_util.c index 6e4352da9..e025db9dd 100644 --- a/citadel/server/modules/smtp/smtp_util.c +++ b/citadel/server/modules/smtp/smtp_util.c @@ -212,7 +212,7 @@ void smtp_do_bounce(const char *instr, int is_final) { 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); diff --git a/citadel/server/modules/spam/serv_spam.c b/citadel/server/modules/spam/serv_spam.c index 863bd0020..4f96f2b97 100644 --- a/citadel/server/modules/spam/serv_spam.c +++ b/citadel/server/modules/spam/serv_spam.c @@ -130,7 +130,7 @@ int spam_assassin(struct CtdlMessage *msg, struct recptypes *recp) { "\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 { diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c index af831b78d..56451eef9 100644 --- a/citadel/server/modules/vcard/serv_vcard.c +++ b/citadel/server/modules/vcard/serv_vcard.c @@ -195,9 +195,9 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { // 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 @@ -311,7 +311,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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); } @@ -358,10 +358,10 @@ int vcard_upload_aftersave(struct CtdlMessage *msg, struct recptypes *recp) { 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. */ @@ -386,7 +386,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg, struct recptypes *recp) { /* 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); } @@ -469,7 +469,7 @@ struct vCard *vcard_get_user(struct ctdluser *u) { 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; } @@ -820,7 +820,7 @@ void dvca_callback(long msgnum, void *userdata) { 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 */ @@ -1020,7 +1020,7 @@ void strip_addresses_already_have(long msgnum, void *userdata) { 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; @@ -1087,7 +1087,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { 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); diff --git a/citadel/server/modules/wiki/serv_wiki.c b/citadel/server/modules/wiki/serv_wiki.c index bf18afd48..e2cbd355e 100644 --- a/citadel/server/modules/wiki/serv_wiki.c +++ b/citadel/server/modules/wiki/serv_wiki.c @@ -119,7 +119,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { } /* 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); @@ -133,13 +133,13 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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); } @@ -153,13 +153,13 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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, @@ -238,7 +238,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { "--%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) */ @@ -253,7 +253,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { */ *boundary = '\0'; - ptr = history_msg->cm_fields[eMesageText]; + ptr = history_msg->cm_fields[eMessageText]; do { ptr = memreadline(ptr, buf, sizeof buf); if (*ptr != 0) { @@ -288,7 +288,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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) { @@ -330,10 +330,10 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { 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); @@ -397,7 +397,7 @@ void wiki_history(char *pagename) { msg = NULL; } - if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) { + if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) { CM_Free(msg); msg = NULL; } @@ -409,7 +409,7 @@ void wiki_history(char *pagename) { 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); @@ -528,7 +528,7 @@ void wiki_rev(char *pagename, char *rev, char *operation) msg = NULL; } - if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) { + if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) { CM_Free(msg); msg = NULL; } @@ -543,7 +543,7 @@ void wiki_rev(char *pagename, char *rev, char *operation) 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 { @@ -562,7 +562,7 @@ void wiki_rev(char *pagename, char *rev, char *operation) msg = NULL; } - if ((msg != NULL) && CM_IsEmpty(msg, eMesageText)) { + if ((msg != NULL) && CM_IsEmpty(msg, eMessageText)) { CM_Free(msg); msg = NULL; } @@ -581,7 +581,7 @@ void wiki_rev(char *pagename, char *rev, char *operation) 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? */ @@ -609,7 +609,7 @@ void wiki_rev(char *pagename, char *rev, char *operation) 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) { diff --git a/citadel/server/modules/xmpp/xmpp_presence.c b/citadel/server/modules/xmpp/xmpp_presence.c index 0658a141c..ff0d1eb2b 100644 --- a/citadel/server/modules/xmpp/xmpp_presence.c +++ b/citadel/server/modules/xmpp/xmpp_presence.c @@ -219,12 +219,12 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { /* 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; } 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) { diff --git a/webcit/messages.c b/webcit/messages.c index 0e6b76d84..69f3c5a83 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -1538,7 +1538,7 @@ void display_enter(void) { case eXclusivID: case eJournal: case eListID: - case eMesageText: + case eMessageText: case eMessagePath: case eSpecialField: case eTimestamp: diff --git a/webcit/messages.h b/webcit/messages.h index def0899a4..41ab5b3d3 100644 --- a/webcit/messages.h +++ b/webcit/messages.h @@ -87,7 +87,7 @@ typedef enum _eMessageField { eJournal, eReplyTo, eListID, - eMesageText, + eMessageText, eIsLocal, eMessagePath, eRecipient, diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index eef21cfc7..2dfb30324 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -1368,7 +1368,7 @@ const char *fieldMnemonics[] = { "jrnl", /* J -> eJournal */ "rep2", /* K -> eReplyTo */ "list", /* L -> eListID */ - "text", /* M -> eMesageText */ + "text", /* M -> eMessageText */ "locl", /* eIsLocal */ "path", /* P -> eMessagePath */ "rcpt", /* R -> eRecipient */