Completed the removal of $Id$ tags in the Citadel server. Also, since the strings...

[citadel.git] / citadel / modules / xmpp / xmpp_presence.c

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 557361169af18a751b9d7bdf96bd50ffb6e79724..cef4661f5083302309402c63ba03974bf7a3f402 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Handle XMPP presence exchanges
  *
  * Copyright (c) 2007-2010 by Art Cancro
@@ -30,6 +28,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
+#include <assert.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -66,10 +65,10 @@
  */
 void xmpp_indicate_presence(char *presence_jid)
 {
-       cprintf("<presence from=\"%s\" to=\"%s\"></presence>",
-               presence_jid,
-               XMPP->client_jid
-       );
+       char xmlbuf[256];
+
+       cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
+       cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
 }
 
 
@@ -122,30 +121,33 @@ void xmpp_wholist_presence_dump(void)
  */
 void xmpp_destroy_buddy(char *presence_jid) {
        static int unsolicited_id = 1;
+       char xmlbuf1[256];
+       char xmlbuf2[256];
 
        if (!presence_jid) return;
        if (!XMPP) return;
        if (!XMPP->client_jid) return;
 
-       CtdlLogPrintf(CTDL_DEBUG, "\033[31mdestroy_buddy(%s)\033[0m\n", presence_jid);
        /* Transmit non-presence information */
        cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
-               presence_jid, XMPP->client_jid
+               xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+               xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
        );
        cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
-               presence_jid, XMPP->client_jid
+               xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+               xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
        );
        // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
 
        /* Do an unsolicited roster update that deletes the contact. */
        cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
-               CC->cs_inet_email,
-               XMPP->client_jid,
+               xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1),
+               xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
                ++unsolicited_id
        );
        cprintf("<query xmlns=\"jabber:iq:roster\">");
-       cprintf("<item jid=\"%s\" subscription=\"remove\">", presence_jid);
-       cprintf("<group>%s</group>", config.c_humannode);
+       cprintf("<item jid=\"%s\" subscription=\"remove\">", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
+       cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
        cprintf("</item>");
        cprintf("</query>"
                "</iq>"
@@ -162,6 +164,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        static int unsolicited_id;
        int visible_sessions = 0;
        int nContexts, i;
+       int which_cptr_is_relevant = (-1);
 
        if (IsEmptyStr(presence_jid)) return;
        if (CC->kill_me) return;
@@ -173,8 +176,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
        /* Count the visible sessions for this user */
        for (i=0; i<nContexts; i++) {
-               if (xmpp_is_visible(CC, &cptr[i])) {
+               if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+                  && (xmpp_is_visible(&cptr[i], CC))
+               )  {
                        ++visible_sessions;
+                       which_cptr_is_relevant = i;
                }
        }
 
@@ -183,31 +189,26 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
        if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
+               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n",
+                       CC->cs_pid, presence_jid);
 
                /* Do an unsolicited roster update that adds a new contact. */
-               for (i=0; i<nContexts; i++) {
-                       if (xmpp_is_visible(CC, &cptr[i])) {
-                               if (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) {
-                                       cprintf("<iq id=\"unsolicited_%x\" type=\"result\">",
-                                               ++unsolicited_id);
-                                       cprintf("<query xmlns=\"jabber:iq:roster\">");
-                                       xmpp_roster_item(&cptr[i]);
-                                       cprintf("</query>"
-                                               "</iq>");
-                               }
-                       }
-               }
+               assert(which_cptr_is_relevant >= 0);
+               cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
+               cprintf("<query xmlns=\"jabber:iq:roster\">");
+               xmpp_roster_item(&cptr[which_cptr_is_relevant]);
+               cprintf("</query></iq>");
 
                /* Transmit presence information */
                xmpp_indicate_presence(presence_jid);
        }
 
        if (visible_sessions == 0) {
-               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n", CC->cs_pid, presence_jid);
-
+               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n",
+                       CC->cs_pid, presence_jid);
                xmpp_destroy_buddy(presence_jid);
        }
+
        free(cptr);
 }
 
@@ -300,6 +301,14 @@ void xmpp_store_mortuary(HashList *mortuary) {
        }
        DeleteHashPos(&HashPos);
 
+       /* FIXME temp crap 
+       StrBufAppendPrintf(themsg, "foo@bar.com\n");
+       StrBufAppendPrintf(themsg, "baz@quux.com\n");
+       StrBufAppendPrintf(themsg, "haha%c\n", 1);
+       StrBufAppendPrintf(themsg, "baaaz@quux.com\n");
+       StrBufAppendPrintf(themsg, "baaaz@quuuuuux.com\n");
+       */
+
        /* Delete the old mortuary */
        CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);