stable now but there are GIANT PIECES MISSING

[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 2544867d409b6fbd0f8b7a065f841258cec5d33a..ca8d439b522c8c6c7ceec88bc11351e04caa7b02 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"
@@ -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"
  
@@ -67,6 +46,8 @@
  void xmpp_output_incoming_messages(void) {
  
         struct ExpressMessage *ptr;
+       char xmlbuf1[4096];
+       char xmlbuf2[4096];
  
         while (CC->FirstExpressMessage != NULL) {
  
@@ -76,11 +57,12 @@ void xmpp_output_incoming_messages(void) {
                 end_critical_section(S_SESSION_TABLE);
  
                 cprintf("<message to=\"%s\" from=\"%s\" type=\"chat\">",
-                       XMPP->client_jid,
-                       ptr->sender_email);
+                       xmlesc(xmlbuf1, XMPP->client_jid, sizeof xmlbuf1),
+                       xmlesc(xmlbuf2, ptr->sender_email, sizeof xmlbuf2)
+               );
                 if (ptr->text != NULL) {
                         striplt(ptr->text);
-                       cprintf("<body>%s</body>", ptr->text);
+                       cprintf("<body>%s</body>", xmlesc(xmlbuf1, ptr->text, sizeof xmlbuf1));
                         free(ptr->text);
                 }
                 cprintf("</message>");
@@ -88,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;
@@ -104,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);