#include <string.h>
#include <limits.h>
#include <ctype.h>
+#include <expat.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "internet_addressing.h"
#include "md5.h"
#include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
#include "serv_xmpp.h"
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->logged_in) {
+ 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->cs_flags&CS_STEALTH)==0) || (aide)) /* aides see everyone */
- && (cptr->user.usernum != CC->user.usernum) /* don't show myself */
+ (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide)) /* aides see everyone */
+ && (cptr[i].user.usernum != CC->user.usernum) /* don't show myself */
+ && (cptr[i].can_receive_im) /* IM-capable session */
) {
cprintf("<presence type=\"available\" from=\"%s\"></presence>",
- cptr->cs_inet_email);
+ cptr[i].cs_inet_email);
}
}
}
+ free(cptr);
}
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 (cptr->logged_in) {
- if ( (!strcasecmp(cptr->cs_inet_email, presence_jid))
- && (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
- ) {
+ 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))
+ && (cptr[i].can_receive_im)
+ ) {
++visible_sessions;
}
}
}
- lprintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
+ CtdlLogPrintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
visible_sessions, presence_jid, CC->cs_pid);
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);
+ 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 (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
- if (cptr->logged_in) {
- if (!strcasecmp(cptr->cs_inet_email, presence_jid)) {
+ 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);
+ jabber_roster_item(&cptr[i]);
cprintf("</query>"
"</iq>");
}
}
if (visible_sessions == 0) {
- lprintf(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);
/* Transmit non-presence information */
cprintf("<presence type=\"unavailable\" from=\"%s\"></presence>", presence_jid);
cprintf("</query>"
"</iq>");
}
+ free(cptr);
}
-
-
-#endif /* HAVE_EXPAT */