The user principal identity is now used as the JID in all XMPP protocol stanzas.

[citadel.git] / citadel / modules / xmpp / xmpp_messages.c

diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c
index d989beb686c74d42381f72bf887883524d3deefc..3a114273ac94fee72a8398124d9ba9e01b5e6144 100644 (file)
--- 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"
@@ -54,7 +45,6 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
@@ -91,12 +81,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 +97,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);