- if (CC->logged_in) {
- if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 0)) {
- if (msg->cm_fields[eAuthor] != NULL) free(msg->cm_fields[eAuthor]);
- if (msg->cm_fields[eNodeName] != NULL) free(msg->cm_fields[eNodeName]);
- if (msg->cm_fields[eHumanNode] != NULL) free(msg->cm_fields[eHumanNode]);
- msg->cm_fields[eAuthor] = strdup(CC->user.fullname);
- msg->cm_fields[eNodeName] = strdup(config.c_nodename);
- msg->cm_fields[eHumanNode] = strdup(config.c_humannode);
- }
+ if (CCC->logged_in) {
+ if ( ((CCC->room.QRflags & QR_MAILBOX) == 0) && (CtdlGetConfigInt("c_imap_keep_from") == 0))
+ {
+ CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+ CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
+ }