Revert xmpp back to a working state

[citadel.git] / citadel / modules / xmpp / xmpp_query_namespace.c

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index e791f3e6bcac09305038cb502165288ee9976b4a..cf6f423a56516cd392ce78ae9c79f93d486ff2f5 100644 (file)
--- 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("<item subscription=\"both\" jid=\"");
-       XPutProp(cptr->cs_inet_email, strlen(cptr->cs_inet_email));
-       XPUT("\" name=\"");
-       XPutProp(cptr->user.fullname, strlen(cptr->user.fullname));
-       XPUT("\">"
-            "<group>");
-       XPutBody(CFG_KEY(c_humannode));
-       XPUT("</group>"
-            "</item>");
+void xmpp_roster_item(struct CitContext *cptr) {
+       char xmlbuf1[256];
+       char xmlbuf2[256];
+
+       cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
+               xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+               xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
+       );
+       cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+       cprintf("</item>");
 }
 
 /* 
@@ -85,7 +83,7 @@ void xmpp_iq_roster_query(void)
        struct CitContext *cptr;
        int nContexts, i;
 
-       XPUT("<query xmlns=\"jabber:iq:roster\">");
+       cprintf("<query xmlns=\"jabber:iq:roster\">");
        cptr = CtdlGetContextArray(&nContexts);
        if (cptr) {
                for (i=0; i<nContexts; i++) {
@@ -96,7 +94,7 @@ void xmpp_iq_roster_query(void)
                }
                free (cptr);
        }
-       XPUT("</query>");
+       cprintf("</query>");
 }
 
 
@@ -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("<iq type=\"result\" ");
+               cprintf("<iq type=\"result\" ");
        }
        else {
-                XPUT("<iq type=\"error\" ");
+               cprintf("<iq type=\"error\" ");
        }
        if (!IsEmptyStr(iq_from)) {
-               XPUT("to=\"");
-               XPutProp(iq_from, strlen(iq_from));
-               XPUT("\" ");
+               cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
        }
-       XPUT("id=\"");
-       XPutProp(iq_id, strlen(iq_id));
-       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("<query xmlns=\"jabber:iq:auth\">"
-                    "<username/><password/><resource/>"
-                    "</query>"
+               cprintf("<query xmlns=\"jabber:iq:auth\">"
+                       "<username/><password/><resource/>"
+                       "</query>"
                );
        }
 
@@ -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 <service-unavailable/>\n",
                            query_xmlns
                );
-               XPUT("<error code=\"503\" type=\"cancel\">"
-                    "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-                    "</error>"
+               cprintf("<error code=\"503\" type=\"cancel\">"
+                       "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+                       "</error>"
                );
        }
 
-       XPUT("</iq>");
+       cprintf("</iq>");
 
        /* 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