XMPP: Cleanup

[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 8b8b43f6b8d87706edfed58238c8ccf426660946..33a2e1ddbeb548c3ba4335960763eda1bc431a12 100644 (file)
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -62,44 +62,51 @@
   * If the client session has instant messages waiting, it outputs
   * unsolicited XML stanzas containing them.
   */
-void xmpp_output_incoming_messages(void) {
-
+void xmpp_output_incoming_messages(void)
+{
+       struct CitContext *CCC = CC;
+       citxmpp *Xmpp = XMPP;
         struct ExpressMessage *ptr;
-       char xmlbuf1[4096];
-       char xmlbuf2[4096];
  
-       while (CC->FirstExpressMessage != NULL) {
+       while (CCC->FirstExpressMessage != NULL) {
  
                 begin_critical_section(S_SESSION_TABLE);
-               ptr = CC->FirstExpressMessage;
-               CC->FirstExpressMessage = CC->FirstExpressMessage->next;
+               ptr = CCC->FirstExpressMessage;
+               CCC->FirstExpressMessage = CCC->FirstExpressMessage->next;
                 end_critical_section(S_SESSION_TABLE);
  
-               cprintf("<message to=\"%s\" from=\"%s\" type=\"chat\">",
-                       xmlesc(xmlbuf1, XMPP->client_jid, sizeof xmlbuf1),
-                       xmlesc(xmlbuf2, ptr->sender_email, sizeof xmlbuf2)
-               );
+               
+               XPUT("<message type=\"chat\" to=\"");
+               XPutProp(Xmpp->client_jid, strlen(Xmpp->client_jid));
+               XPUT("\" from=\"");
+               XPutProp(ptr->sender_email, strlen(ptr->sender_email));
+               XPUT("\" >");
+
                 if (ptr->text != NULL) {
                         striplt(ptr->text);
-                       cprintf("<body>%s</body>", xmlesc(xmlbuf1, ptr->text, sizeof xmlbuf1));
+                       XPUT("<body>");
+                       XPutBody(ptr->text, strlen(ptr->text));
+                       XPUT("</body>");
                         free(ptr->text);
                 }
-               cprintf("</message>");
+               XPUT("</message>");
                 free(ptr);
         }
+       XUnbuffer();
  }
  
  /*
   * Client is sending a message.
   */
  void xmpp_send_message(char *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 (!CC->logged_in) return;
+       if (!CCC->logged_in) return;
  
         for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
                 if (    (cptr->logged_in)
@@ -111,12 +118,26 @@ void xmpp_send_message(char *message_to, char *message_body) {
         }
  
         if (recp) {
-               PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body);
+               PerformXmsgHooks(CCC->user.fullname, CCC->cs_inet_email, recp, message_body);
         }
  
         free(XMPP->message_body);
         XMPP->message_body = NULL;
         XMPP->message_to[0] = 0;
-       time(&CC->lastidle);
+       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->html_tag_level = 0;
+}
+
  
+
+CTDL_MODULE_INIT(xmpp_message)
+{
+       if (!threading) {
+               AddXMPPEndHandler(HKEY("message"),       xmpp_end_message, 0);
+       }
+       return "xmpp_message";
+}