#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_iq_roster_query(void)
{
struct CitContext *cptr;
+ int nContexts, i;
int aide = (CC->user.axlevel >= 6);
cprintf("<query xmlns=\"jabber:iq:roster\">");
- for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-
- if (
- (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
- && (cptr->user.usernum != CC->user.usernum)
- ) {
- jabber_roster_item(cptr);
+ 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))
+ && (cptr[i].user.usernum != CC->user.usernum)
+ ) {
+ jabber_roster_item(&cptr[i]);
+ }
}
}
-
+ free (cptr);
cprintf("</query>");
}
void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns) {
- lprintf(CTDL_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
+ CtdlLogPrintf(CTDL_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
/*
* Beginning of query result.
cprintf("</iq>");
}
-
-#endif /* HAVE_EXPAT */