X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=cf6f423a56516cd392ce78ae9c79f93d486ff2f5;hb=e7c125bafc3bd24fd9cfb18c39b29abd19c7478f;hp=e791f3e6bcac09305038cb502165288ee9976b4a;hpb=62e5cd8b5bcf983f843a7e27d0ecddc4b11b13c3;p=citadel.git
diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index e791f3e6b..cf6f423a5 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -59,18 +59,16 @@
/*
* Output a single roster item, for roster queries or pushes
*/
-void xmpp_roster_item(struct CitContext *cptr)
-{
-
- XPUT("- cs_inet_email, strlen(cptr->cs_inet_email));
- XPUT("\" name=\"");
- XPutProp(cptr->user.fullname, strlen(cptr->user.fullname));
- XPUT("\">"
- "");
- XPutBody(CFG_KEY(c_humannode));
- XPUT(""
- "
");
+void xmpp_roster_item(struct CitContext *cptr) {
+ char xmlbuf1[256];
+ char xmlbuf2[256];
+
+ cprintf("- ",
+ xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+ xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
+ );
+ cprintf("%s", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+ cprintf("
");
}
/*
@@ -85,7 +83,7 @@ void xmpp_iq_roster_query(void)
struct CitContext *cptr;
int nContexts, i;
- XPUT("");
+ cprintf("");
cptr = CtdlGetContextArray(&nContexts);
if (cptr) {
for (i=0; i");
+ cprintf("");
}
@@ -113,6 +111,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
{
int supported_namespace = 0;
int roster_query = 0;
+ char xmlbuf[256];
/* We need to know before we begin the response whether this is a supported namespace, so
* unfortunately all supported namespaces need to be defined here *and* down below where
@@ -131,19 +130,15 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
* Beginning of query result.
*/
if (supported_namespace) {
- XPUT("");
+ cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
/*
* Is this a query we know how to handle?
@@ -155,9 +150,9 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
}
else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) {
- XPUT(""
- ""
- ""
+ cprintf(""
+ ""
+ ""
);
}
@@ -171,13 +166,13 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
"Unknown query namespace '%s' - returning \n",
query_xmlns
);
- XPUT(""
- ""
- ""
+ cprintf(""
+ ""
+ ""
);
}
- XPUT("");
+ cprintf("");
/* If we told the client who is on the roster, we also need to tell the client
* who is *not* on the roster. (It's down here because we can't do it in the same