Fix warnings all over citserver; handle function replies; remove unused code.

[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..5265fc1886d526f4887584d0aa30b0f61afaff8e 100644 (file)
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -1,6 +1,4 @@
  /*
- * $Id$ 
- *
   * Handle messages sent and received using XMPP (Jabber) protocol
   *
   * Copyright (c) 2007-2010 by Art Cancro
@@ -67,6 +65,8 @@
  void xmpp_output_incoming_messages(void) {
  
         struct ExpressMessage *ptr;
+       char xmlbuf1[4096];
+       char xmlbuf2[4096];
  
         while (CC->FirstExpressMessage != NULL) {
  
@@ -76,11 +76,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>");
@@ -93,7 +94,6 @@ void xmpp_output_incoming_messages(void) {
   */
  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;
@@ -111,7 +111,7 @@ void xmpp_send_message(char *message_to, char *message_body) {
         }
  
         if (recp) {
-               message_sent = PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body);
+               PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body);
         }
  
         free(XMPP->message_body);