X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fjabber%2Fxmpp_messages.c;h=405856e9295fc3657a3047328b0efe8bc3c57b07;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=d81e115d3be20241a5e4301c82ed779b3ef8207b;hpb=0a1e8f39d1e1d65d1d7811b3cbc641fcf47c04c8;p=citadel.git diff --git a/citadel/modules/jabber/xmpp_messages.c b/citadel/modules/jabber/xmpp_messages.c index d81e115d3..405856e92 100644 --- a/citadel/modules/jabber/xmpp_messages.c +++ b/citadel/modules/jabber/xmpp_messages.c @@ -3,8 +3,21 @@ * * Handle messages sent and received using XMPP (Jabber) protocol * - * Copyright (c) 2007 by Art Cancro - * This code is released under the terms of the GNU General Public License. + * Copyright (c) 2007-2009 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 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 * */ @@ -33,6 +46,7 @@ #include #include #include +#include #include #include "citadel.h" #include "server.h" @@ -42,9 +56,6 @@ #include "internet_addressing.h" #include "md5.h" #include "ctdl_module.h" - -#ifdef HAVE_EXPAT -#include #include "serv_xmpp.h" @@ -64,10 +75,9 @@ void jabber_output_incoming_messages(void) { CC->FirstExpressMessage = CC->FirstExpressMessage->next; end_critical_section(S_SESSION_TABLE); - /* FIXME we have to get the sender's email address. This may involve tweaking - * the core IM module a bit. - */ - cprintf("", XMPP->client_jid); + cprintf("", + XMPP->client_jid, + ptr->sender_email); if (ptr->text != NULL) { striplt(ptr->text); cprintf("%s", ptr->text); @@ -78,5 +88,35 @@ void jabber_output_incoming_messages(void) { } } +/* + * Client is sending a message. + */ +void jabber_send_message(char *message_to, char *message_body) { + char *recp = NULL; + int message_sent = 0; + struct CitContext *cptr; + + if (message_body == NULL) return; + if (message_to == NULL) 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, message_to)) + ) { + recp = cptr->user.fullname; + } + } + + if (recp) { + message_sent = PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body); + } + + free(XMPP->message_body); + XMPP->message_body = NULL; + XMPP->message_to[0] = 0; + time(&CC->lastidle); +} -#endif /* HAVE_EXPAT */