X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=cf6f423a56516cd392ce78ae9c79f93d486ff2f5;hb=e7c125bafc3bd24fd9cfb18c39b29abd19c7478f;hp=e7fcc0c8a98bba7a336e646ec46fc17a8005bbb2;hpb=b10ebd5b1e010488870853620a35d704a3e36f82;p=citadel.git
diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index e7fcc0c8a..cf6f423a5 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -59,21 +59,16 @@
/*
* Output a single roster item, for roster queries or pushes
*/
-void xmpp_roster_item(struct CitContext *cptr)
-{
- struct CitContext *CCC=CC;
-
- XPrint(HKEY("item"), 0,
- XCPROPERTY("subscription", "both"),
- XPROPERTY("jid", CCC->cs_inet_email, strlen(CCC->cs_inet_email)),
- XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)),
- TYPE_ARGEND);
-
- XPrint(HKEY("group"), XCLOSED,
- XCFGBODY(c_humannode),
- TYPE_ARGEND);
-
- 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("
");
}
/*
@@ -88,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("");
}
@@ -112,17 +107,12 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
*
*/
-void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_to*/, char *query_xmlns)
+void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
{
int supported_namespace = 0;
int roster_query = 0;
- const char *TypeStr;
- long TLen;
- ConstStr Type[] = {
- {HKEY("result")},
- {HKEY("error")}
- };
-
+ 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
* they are handled.
@@ -134,25 +124,21 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_
supported_namespace = 1;
}
- XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", ChrPtr(IQ->id), ChrPtr(IQ->from), ChrPtr(IQ->to), query_xmlns);
+ XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
/*
* Beginning of query result.
*/
if (supported_namespace) {
- TypeStr = Type[0].Key;
- TLen = Type[0].len;
+ cprintf("from),
- XSPROPERTY("id", IQ->id),
- TYPE_ARGEND);
+ if (!IsEmptyStr(iq_from)) {
+ cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
+ }
+ cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
/*
* Is this a query we know how to handle?
@@ -164,9 +150,9 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_
}
else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) {
- XPUT(""
- ""
- ""
+ cprintf(""
+ ""
+ ""
);
}
@@ -180,13 +166,13 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_
"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