libical, expat, and libsieve are now *required*.

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

diff --git a/citadel/modules/jabber/xmpp_presence.c b/citadel/modules/jabber/xmpp_presence.c
index c4e86386b4c8bece74bf000e5a0022b708b2aad9..e3d9cc4665d09b789c9cb89f8a94e9b8481036a6 100644 (file)
--- a/citadel/modules/jabber/xmpp_presence.c
+++ b/citadel/modules/jabber/xmpp_presence.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -42,9 +43,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 
@@ -54,16 +52,26 @@
 void jabber_wholist_presence_dump(void)
 {
        struct CitContext *cptr = NULL;
+       int nContexts, i;
+       
        int aide = (CC->user.axlevel >= 6);
 
-       for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-               if (
-                  (((cptr->cs_flags&CS_STEALTH)==0) || (aide))         /* aides can see everyone */
-                  && (cptr->user.usernum != CC->user.usernum)          /* don't tell me about myself */
-                  ) {
-                       cprintf("<presence type=\"available\" from=\"%s\"></presence>", cptr->cs_inet_email);
+       cptr = CtdlGetContextArray(&nContexts);
+       if (!cptr)
+               return ; /** FIXME: Does jabber need to send something to maintain the protocol?  */
+               
+       for (i=0; i<nContexts; i++) {
+               if (cptr[i].logged_in) {
+                       if (
+                          (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))               /* aides see everyone */
+                          && (cptr[i].user.usernum != CC->user.usernum)                /* don't show myself */
+                          ) {
+                               cprintf("<presence type=\"available\" from=\"%s\"></presence>",
+                                       cptr[i].cs_inet_email);
+                       }
                }
        }
+       free(cptr);
 }
 
 
@@ -72,52 +80,61 @@ void jabber_wholist_presence_dump(void)
  * When a user logs in or out of the local Citadel system, notify all Jabber sessions
  * about it.
  */
-void xmpp_presence_notify(char *presence_jid, char *presence_type) {
+void xmpp_presence_notify(char *presence_jid, int event_type) {
        struct CitContext *cptr;
        static int unsolicited_id;
        int visible_sessions = 0;
+       int nContexts, i;
        int aide = (CC->user.axlevel >= 6);
 
        if (IsEmptyStr(presence_jid)) return;
 
+       cptr = CtdlGetContextArray(&nContexts);
+       if (!cptr)
+               return ; /** FIXME: Does jabber need to send something to maintain the protocol?  */
+               
        /* Count the visible sessions for this user */
-       for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-               if (  (!strcasecmp(cptr->cs_inet_email, presence_jid)) 
-                  && (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
-                  ) {
-                       ++visible_sessions;
+       for (i=0; i<nContexts; i++) {
+               if (cptr[i].logged_in) {
+                       if (  (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) 
+                          && (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
+                          ) {
+                               ++visible_sessions;
+                       }
                }
        }
 
        lprintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
                visible_sessions, presence_jid, CC->cs_pid);
 
-       if (
-          ( (strcasecmp(presence_type, "unavailable")) || (strcasecmp(presence_type, "unsubscribed")) )
-          && (visible_sessions == 1) ) {
+       if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
                lprintf(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 (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-                       if (!strcasecmp(cptr->cs_inet_email, presence_jid)) {
-                               cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
-                               cprintf("<query xmlns=\"jabber:iq:roster\">");
-                               jabber_roster_item(cptr);
-                               cprintf("</query>"
-                                       "</iq>");
+               for (i=0; i<nContexts; i++) {
+                       if (cptr[i].logged_in) {
+                               if (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) {
+                                       cprintf("<iq id=\"unsolicited_%x\" type=\"result\">",
+                                               ++unsolicited_id);
+                                       cprintf("<query xmlns=\"jabber:iq:roster\">");
+                                       jabber_roster_item(&cptr[i]);
+                                       cprintf("</query>"
+                                               "</iq>");
+                               }
                        }
                }
 
                /* Transmit presence information */
-               cprintf("<presence type=\"%s\" from=\"%s\"></presence>", presence_type, presence_jid);
+               cprintf("<presence type=\"available\" from=\"%s\"></presence>", presence_jid);
        }
 
-       if ( (!strcasecmp(presence_type, "unavailable")) && (visible_sessions == 0) ) {
+       if (visible_sessions == 0) {
                lprintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n", CC->cs_pid, presence_jid);
 
                /* Transmit non-presence information */
-               cprintf("<presence type=\"%s\" from=\"%s\"></presence>", presence_type, presence_jid);
+               cprintf("<presence type=\"unavailable\" from=\"%s\"></presence>", presence_jid);
+               cprintf("<presence type=\"unsubscribed\" from=\"%s\"></presence>", presence_jid);
 
                /* Do an unsolicited roster update that deletes the contact. */
                cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
@@ -128,7 +145,5 @@ void xmpp_presence_notify(char *presence_jid, char *presence_type) {
                cprintf("</query>"
                        "</iq>");
        }
+       free(cptr);
 }
-
-
-#endif /* HAVE_EXPAT */