X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;fp=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=e791f3e6bcac09305038cb502165288ee9976b4a;hp=cf6f423a56516cd392ce78ae9c79f93d486ff2f5;hb=62e5cd8b5bcf983f843a7e27d0ecddc4b11b13c3;hpb=99d075e91a49e16c74558b7ada9ea6aa50cc8bbd
diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index cf6f423a5..e791f3e6b 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -59,16 +59,18 @@
/*
* Output a single roster item, for roster queries or pushes
*/
-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("
");
+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(""
+ "
");
}
/*
@@ -83,7 +85,7 @@ void xmpp_iq_roster_query(void)
struct CitContext *cptr;
int nContexts, i;
- cprintf("");
+ XPUT("");
cptr = CtdlGetContextArray(&nContexts);
if (cptr) {
for (i=0; i");
+ XPUT("");
}
@@ -111,7 +113,6 @@ 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
@@ -130,15 +131,19 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
* Beginning of query result.
*/
if (supported_namespace) {
- cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
+ XPUT("id=\"");
+ XPutProp(iq_id, strlen(iq_id));
+ XPUT("\">");
/*
* Is this a query we know how to handle?
@@ -150,9 +155,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")) {
- cprintf(""
- ""
- ""
+ XPUT(""
+ ""
+ ""
);
}
@@ -166,13 +171,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
);
- cprintf(""
- ""
- ""
+ XPUT(""
+ ""
+ ""
);
}
- cprintf("");
+ XPUT("");
/* 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