X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Finstmsg%2Fserv_instmsg.c;h=a774c61f2f4d030160bf0c7bc39e550b2c7b7120;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=1bf8c728a9877ca1b6cd35fa7030b70214d73c39;hpb=62235cdefb9170733cafb605f8bb5ec4d57ed1d1;p=citadel.git

diff --git a/citadel/modules/instmsg/serv_instmsg.c b/citadel/modules/instmsg/serv_instmsg.c
index 1bf8c728a..a774c61f2 100644
--- a/citadel/modules/instmsg/serv_instmsg.c
+++ b/citadel/modules/instmsg/serv_instmsg.c
@@ -1,7 +1,7 @@
 /*
  * This module handles instant messaging between users.
  * 
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -235,7 +235,6 @@ int send_instant_message(char *lun, char *lem, char *x_user, char *x_msg)
 	int message_sent = 0;		/* number of successful sends */
 	struct CitContext *ccptr;
 	struct ExpressMessage *newmsg = NULL;
-	char *un;
 	int do_send = 0;		/* 1 = send message; 0 = only check for valid recipient */
 	static int serial_number = 0;	/* this keeps messages from getting logged twice */
 
@@ -248,14 +247,7 @@ int send_instant_message(char *lun, char *lem, char *x_user, char *x_msg)
 	++serial_number;
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 
-		if (ccptr->fake_username[0]) {
-			un = ccptr->fake_username;
-		}
-		else {
-			un = ccptr->user.fullname;
-		}
-
-		if ( ((!strcasecmp(un, x_user))
+		if ( ((!strcasecmp(ccptr->user.fullname, x_user))
 		    || (!strcasecmp(x_user, "broadcast")))
 		    && (ccptr->can_receive_im)
 		    && ((ccptr->disable_exp == 0)
@@ -294,7 +286,6 @@ void cmd_sexp(char *argbuf)
 	int message_sent = 0;
 	char x_user[USERNAME_SIZE];
 	char x_msg[1024];
-	char *lun;
 	char *lem;
 	char *x_big_msgbuf = NULL;
 
@@ -302,14 +293,8 @@ void cmd_sexp(char *argbuf)
 		cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
 		return;
 	}
-	if (CC->fake_username[0]) {
-		lun = CC->fake_username;
-	}
-	else {
-		lun = CC->user.fullname;
-	}
 
-	lem = CC->cs_inet_email;
+	lem = CC->cs_principal_id;
 
 	extract_token(x_user, argbuf, 0, '|', sizeof x_user);
 	extract_token(x_msg, argbuf, 1, '|', sizeof x_msg);
@@ -325,7 +310,7 @@ void cmd_sexp(char *argbuf)
 	}
 	/* This loop handles text-transfer pages */
 	if (!strcmp(x_msg, "-")) {
-		message_sent = PerformXmsgHooks(lun, lem, x_user, "");
+		message_sent = PerformXmsgHooks(CC->user.fullname, lem, x_user, "");
 		if (message_sent == 0) {
 			if (CtdlGetUser(NULL, x_user))
 				cprintf("%d '%s' does not exist.\n",
@@ -349,12 +334,12 @@ void cmd_sexp(char *argbuf)
 				strcat(x_big_msgbuf, "\n");
 			strcat(x_big_msgbuf, x_msg);
 		}
-		PerformXmsgHooks(lun, lem, x_user, x_big_msgbuf);
+		PerformXmsgHooks(CC->user.fullname, lem, x_user, x_big_msgbuf);
 		free(x_big_msgbuf);
 
 		/* This loop handles inline pages */
 	} else {
-		message_sent = PerformXmsgHooks(lun, lem, x_user, x_msg);
+		message_sent = PerformXmsgHooks(CC->user.fullname, lem, x_user, x_msg);
 
 		if (message_sent > 0) {
 			if (!IsEmptyStr(x_msg)) {
@@ -494,7 +479,7 @@ void flush_individual_conversation(struct imlog *im) {
 	 */
 	snprintf(roomname, sizeof roomname, "%010ld.%s", im->usernums[1], PAGELOGROOM);
 	CtdlCreateRoom(roomname, 5, "", 0, 1, 1, VIEW_BBS);
-	msgnum = CtdlSubmitMsg(msg, NULL, roomname, 0);
+	msgnum = CtdlSubmitMsg(msg, NULL, roomname);
 	CM_Free(msg);
 
 	/* If there is a valid user number in usernums[0], save a copy for them too. */