X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_messages.c;h=3a114273ac94fee72a8398124d9ba9e01b5e6144;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=1f7123aebb9bc0e1382d7c743c7e12ebc6d0c6fa;hpb=4b0153bbdd15ddc4bc7b6193ff7ecb531b330a3c;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c index 1f7123aeb..3a114273a 100644 --- a/citadel/modules/xmpp/xmpp_messages.c +++ b/citadel/modules/xmpp/xmpp_messages.c @@ -5,18 +5,11 @@ * * 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. - * - * - * - * - * */ #include "sysdep.h" @@ -52,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" @@ -62,80 +54,62 @@ * If the client session has instant messages waiting, it outputs * unsolicited XML stanzas containing them. */ -void xmpp_output_incoming_messages(void) -{ - struct CitContext *CCC = CC; - citxmpp *Xmpp = XMPP; +void xmpp_output_incoming_messages(void) { + struct ExpressMessage *ptr; + char xmlbuf1[4096]; + char xmlbuf2[4096]; - while (CCC->FirstExpressMessage != NULL) { + while (CC->FirstExpressMessage != NULL) { begin_critical_section(S_SESSION_TABLE); - ptr = CCC->FirstExpressMessage; - CCC->FirstExpressMessage = CCC->FirstExpressMessage->next; + ptr = CC->FirstExpressMessage; + CC->FirstExpressMessage = CC->FirstExpressMessage->next; end_critical_section(S_SESSION_TABLE); - 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); - + cprintf("", + xmlesc(xmlbuf1, XMPP->client_jid, sizeof xmlbuf1), + xmlesc(xmlbuf2, ptr->sender_email, sizeof xmlbuf2) + ); if (ptr->text != NULL) { striplt(ptr->text); - XPrint(HKEY("body"), XCLOSED, - XBODY(ptr->text, strlen(ptr->text)), - TYPE_ARGEND); + cprintf("%s", xmlesc(xmlbuf1, ptr->text, sizeof xmlbuf1)); free(ptr->text); } - XPUT(""); + cprintf(""); free(ptr); } - XUnbuffer(); } + /* * Client is sending a message. */ -void xmpp_send_message(StrBuf *message_to, char *message_body) { - struct CitContext *CCC = CC; +void xmpp_send_message(char *message_to, char *message_body) { char *recp = NULL; struct CitContext *cptr; if (message_body == NULL) return; if (message_to == NULL) return; - if (StrLength(message_to) == 0) return; - if (!CCC->logged_in) return; + if (IsEmptyStr(message_to)) return; + if (!CC->logged_in) return; for (cptr = ContextList; cptr != NULL; cptr = cptr->next) { if ( (cptr->logged_in) && (cptr->can_receive_im) - && (!strcasecmp(cptr->cs_inet_email, ChrPtr(message_to))) + && (!strcasecmp(cptr->cs_principal_id, message_to)) ) { recp = cptr->user.fullname; } } if (recp) { - PerformXmsgHooks(CCC->user.fullname, CCC->cs_inet_email, recp, message_body); + PerformXmsgHooks(CC->user.fullname, CC->cs_principal_id, recp, message_body); } free(XMPP->message_body); XMPP->message_body = NULL; - time(&CCC->lastidle); + XMPP->message_to[0] = 0; + time(&CC->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"; -}