dammit, learn to spell

[citadel.git] / citadel / server / modules / vcard / serv_vcard.c

diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c
index 599a1e8587e528908c0c7d4201086cd432359581..56451eef941a5a270e6b49a68093693e546e3409 100644 (file)
--- 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
@@ -245,7 +245,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
                // Make the author of the message the name of the user.
                if (!IsEmptyStr(usbuf.fullname)) {
-                       CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
+                       CM_SetField(msg, eAuthor, usbuf.fullname);
                }
        }
 
@@ -268,7 +268,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
                        snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME);
                }
                else {
-                       // If the vCard has no UID, then give it one. */
+                       // If the vCard has no UID, then give it one.
                        generate_uuid(buf);
                }
                vcard_set_prop(v, "UID", buf, 0);
@@ -282,7 +282,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
        s = vcard_get_prop(v, "UID", 1, 0, 0);
        if (!IsEmptyStr(s)) {
-               CM_SetField(msg, eExclusiveID, s, strlen(s));
+               CM_SetField(msg, eExclusiveID, s);
                if (CM_IsEmpty(msg, eMsgSubject)) {
                        CM_CopyField(msg, eMsgSubject, eExclusiveID);
                }
@@ -296,7 +296,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
                s = vcard_get_prop(v, "N", 1, 0, 0);
        }
        if (!IsEmptyStr(s)) {
-               CM_SetField(msg, eMsgSubject, s, strlen(s));
+               CM_SetField(msg, eMsgSubject, s);
        }
 
        /* Re-serialize it back into the msg body */
@@ -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;
@@ -1071,10 +1071,10 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
                        vmsg->cm_magic = CTDLMESSAGE_MAGIC;
                        vmsg->cm_anon_type = MES_NORMAL;
                        vmsg->cm_format_type = FMT_RFC822;
-                       CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
+                       CM_SetField(vmsg, eAuthor, "Citadel");
                        s = vcard_get_prop(v, "UID", 1, 0, 0);
                        if (!IsEmptyStr(s)) {
-                               CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+                               CM_SetField(vmsg, eExclusiveID, s);
                        }
                        ser = vcard_serialize(v);
                        if (ser != NULL) {
@@ -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);