X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_messages.c;h=ca8d439b522c8c6c7ceec88bc11351e04caa7b02;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=d989beb686c74d42381f72bf887883524d3deefc;hpb=6a969c7e8f80199f8b8bd5d76b40eb3f53ab3ca4;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c
index d989beb68..ca8d439b5 100644
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -1,24 +1,15 @@
 /*
- * $Id$ 
- *
  * Handle messages sent and received using XMPP (Jabber) protocol
  *
  * Copyright (c) 2007-2010 by Art Cancro
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "sysdep.h"
@@ -30,18 +21,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -54,7 +34,6 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
@@ -91,12 +70,12 @@ void xmpp_output_incoming_messages(void) {
 	}
 }
 
+
 /*
  * Client is sending a message.
  */
 void xmpp_send_message(char *message_to, char *message_body) {
 	char *recp = NULL;
-	int message_sent = 0;
 	struct CitContext *cptr;
 
 	if (message_body == NULL) return;
@@ -107,14 +86,14 @@ void xmpp_send_message(char *message_to, char *message_body) {
 	for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
 		if (	(cptr->logged_in)
 			&& (cptr->can_receive_im)
-			&& (!strcasecmp(cptr->cs_inet_email, message_to))
+			&& (!strcasecmp(cptr->cs_principal_id, message_to))
 		) {
 			recp = cptr->user.fullname;
 		}
 	}
 
 	if (recp) {
-		message_sent = PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body);
+		PerformXmsgHooks(CC->user.fullname, CC->cs_principal_id, recp, message_body);
 	}
 
 	free(XMPP->message_body);