Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / imap / imap_misc.c

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 5485836a9666de4984d61fcc90905be3e732a3e9..f4d501c9d3853dd56c8895e804ac0c5d943755ea 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -306,7 +306,7 @@ void imap_append(int num_parms, ConstStr *Params) {
                return;
        }
 
-       strcpy(new_message_flags, "");
+       *new_message_flags = '\0';
        if (num_parms >= 5) {
                for (i=3; i<num_parms; ++i) {
                        strcat(new_message_flags, Params[i].Key);
@@ -374,7 +374,7 @@ void imap_append(int num_parms, ConstStr *Params) {
        if (Imap->selected) {
                strcpy(savedroom, CCC->room.QRname);
        }
-       CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+       CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
        /* If the user is locally authenticated, FORCE the From: header to
         * show up as the real sender.  FIXME do we really want to do this?
@@ -387,8 +387,8 @@ void imap_append(int num_parms, ConstStr *Params) {
           if ( ((CCC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 0)) {
 
                CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
-               CM_SetField(msg, eNodeName, config.c_nodename, strlen(config.c_nodename));
-               CM_SetField(msg, eHumanNode, config.c_humannode, strlen(config.c_humannode));
+               CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
+               CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
            }
        }
 
@@ -424,13 +424,13 @@ void imap_append(int num_parms, ConstStr *Params) {
         * our happy day without violent explosions.
         */
        if (Imap->selected) {
-               CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+               CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
        }
 
        /* We don't need this buffer anymore */
        CM_Free(msg);
 
-       if (new_message_flags != NULL) {
+       if (IsEmptyStr(new_message_flags)) {
                imap_do_append_flags(new_msgnum, new_message_flags);
        }
 }