Apply patches sugested by Taroe Hong plus some more bugfixes.

[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 33a2e1ddbeb548c3ba4335960763eda1bc431a12..1f7123aebb9bc0e1382d7c743c7e12ebc6d0c6fa 100644 (file)
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -75,18 +75,17 @@ void xmpp_output_incoming_messages(void)
                 CCC->FirstExpressMessage = CCC->FirstExpressMessage->next;
                 end_critical_section(S_SESSION_TABLE);
  
-               
-               XPUT("<message type=\"chat\" to=\"");
-               XPutProp(Xmpp->client_jid, strlen(Xmpp->client_jid));
-               XPUT("\" from=\"");
-               XPutProp(ptr->sender_email, strlen(ptr->sender_email));
-               XPUT("\" >");
+               XPrint(HKEY("message"), 0,
+                      XCPROPERTY("type", "chat"),
+                      XPROPERTY("to", Xmpp->client_jid, strlen(Xmpp->client_jid)),
+                      XPROPERTY("from", ptr->sender_email, strlen(ptr->sender_email)),
+                      TYPE_ARGEND);
  
                 if (ptr->text != NULL) {
                         striplt(ptr->text);
-                       XPUT("<body>");
-                       XPutBody(ptr->text, strlen(ptr->text));
-                       XPUT("</body>");
+                       XPrint(HKEY("body"), XCLOSED,
+                              XBODY(ptr->text, strlen(ptr->text)),
+                              TYPE_ARGEND);
                         free(ptr->text);
                 }
                 XPUT("</message>");
@@ -98,20 +97,20 @@ void xmpp_output_incoming_messages(void)
  /*
   * Client is sending a message.
   */
-void xmpp_send_message(char *message_to, char *message_body) {
+void xmpp_send_message(StrBuf *message_to, char *message_body) {
         struct CitContext *CCC = CC;
         char *recp = NULL;
         struct CitContext *cptr;
  
         if (message_body == NULL) return;
         if (message_to == NULL) return;
-       if (IsEmptyStr(message_to)) return;
+       if (StrLength(message_to) == 0) return;
         if (!CCC->logged_in) return;
  
         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_inet_email, ChrPtr(message_to)))
                 ) {
                         recp = cptr->user.fullname;
                 }
@@ -123,12 +122,11 @@ void xmpp_send_message(char *message_to, char *message_body) {
  
         free(XMPP->message_body);
         XMPP->message_body = NULL;
-       XMPP->message_to[0] = 0;
         time(&CCC->lastidle);
  }
  void xmpp_end_message(void *data, const char *supplied_el, const char **attr)
  {
-       xmpp_send_message(XMPP->message_to, XMPP->message_body);
+       xmpp_send_message(XMPP->Message.to, XMPP->message_body);
         XMPP->html_tag_level = 0;
  }