* make QP encoding of senders optional, so we can flag it if we need it.

[citadel.git] / citadel / modules / chat / serv_chat.c

diff --git a/citadel/modules/chat/serv_chat.c b/citadel/modules/chat/serv_chat.c
index 9a517f0ceb45c9f2858d705dd578cdc5aadae6f0..2cf3bb233da43313ae483ffc938af174f9dca7be 100644 (file)
--- a/citadel/modules/chat/serv_chat.c
+++ b/citadel/modules/chat/serv_chat.c
@@ -644,7 +644,7 @@ int send_instant_message(char *lun, char *lem, char *x_user, char *x_msg)
                 * creating the room if necessary.
                 */
                create_room(PAGELOGROOM, 4, "", 0, 1, 0, VIEW_BBS);
-               msgnum = CtdlSubmitMsg(logmsg, NULL, PAGELOGROOM);
+               msgnum = CtdlSubmitMsg(logmsg, NULL, PAGELOGROOM, 0);
 
                /* Now save a copy in the global log room, if configured */
                if (!IsEmptyStr(config.c_logpages)) {
@@ -724,8 +724,7 @@ void cmd_sexp(char *argbuf)
                        SEND_LISTING, message_sent);
                x_big_msgbuf = malloc(SIZ);
                memset(x_big_msgbuf, 0, SIZ);
-               while (client_getln(x_msg, sizeof x_msg),
-                     strcmp(x_msg, "000")) {
+               while (client_getln(x_msg, sizeof x_msg) >= 0 && strcmp(x_msg, "000")) {
                        x_big_msgbuf = realloc(x_big_msgbuf,
                               strlen(x_big_msgbuf) + strlen(x_msg) + 4);
                        if (!IsEmptyStr(x_big_msgbuf))