* More license declarations

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

diff --git a/citadel/modules/jabber/xmpp_query_namespace.c b/citadel/modules/jabber/xmpp_query_namespace.c
index 5fd3e223e23c48582de9914da9471cc761e92c60..0c34d5f7b68d8aa0297d6ae2d72606ac534b3323 100644 (file)
--- a/citadel/modules/jabber/xmpp_query_namespace.c
+++ b/citadel/modules/jabber/xmpp_query_namespace.c
@@ -1,11 +1,23 @@
 /*
- * $Id:  $ 
+ * $Id$ 
  *
  * Handle <iq> <get> <query> type situations (namespace queries)
  *
- * Copyright (c) 2007 by Art Cancro
- * This code is released under the terms of the GNU General Public License.
+ * Copyright (c) 2007-2009 by Art Cancro
  *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -33,6 +45,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -42,53 +55,51 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 
+/*
+ * Output a single roster item, for roster queries or pushes
+ */
+void jabber_roster_item(struct CitContext *cptr) {
+       cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
+               cptr->cs_inet_email,
+               cptr->user.fullname
+       );
+       cprintf("<group>%s</group>", config.c_humannode);
+       cprintf("</item>");
+}
+
 /* 
  * Return the results for a "jabber:iq:roster:query"
  *
- * Since we are not yet managing a roster, we simply return the entire wholist.
+ * Since we are not yet managing a roster, we simply return the entire wholist
+ * (minus any entries for this user -- don't tell me about myself)
  *
  */
 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)) {
-                       cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
-                               cptr->cs_inet_email,
-                               cptr->user.fullname
-                       );
-                       cprintf("<group>%s</group>", config.c_humannode);
-                       cprintf("</item>");
+       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]);
+                       }
                }
        }
-
-/**** these remain here for documentation example only
-
-       cprintf("<item jid=\"romeo@example.net\" name=\"Romeo\" subscription=\"both\">");
-       cprintf("<group>Friends</group>");
-       cprintf("</item>");
-
-       cprintf("<item jid=\"mercutio@example.org\" name=\"Mercutio\" subscription=\"from\">");
-       cprintf("<group>Friends</group>");
-       cprintf("</item>");
-
-       cprintf("<item jid=\"benvolio@example.org\" name=\"Benvolio\" subscription=\"both\">");
-       cprintf("<group>Friends</group>");
-       cprintf("</item>");
-
- ****/
-
+       free (cptr);
        cprintf("</query>");
 }
 
@@ -99,14 +110,12 @@ void jabber_iq_roster_query(void)
 xmpp_query_namespace(purple5b5c1e58, splorph.xand.com, http://jabber.org/protocol/disco#items:query)
 xmpp_query_namespace(purple5b5c1e59, splorph.xand.com, http://jabber.org/protocol/disco#info:query)
 xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
-xmpp_query_namespace(purple5b5c1e5b, , jabber:iq:roster:query)
  *
  */
 
 void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns) {
 
-       lprintf(CTDL_DEBUG, "\e[31mxmpp_query_namespace(%s, %s, %s, %s)\e[0m\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.
@@ -120,10 +129,18 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
        /*
         * Is this a query we know how to handle?
         */
+
        if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) {
                jabber_iq_roster_query();
        }
 
+       else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) {
+               cprintf("<query xmlns=\"jabber:iq:auth\">"
+                       "<username/><password/><resource/>"
+                       "</query>"
+               );
+       }
+
        /*
         * End of query result.  If we didn't hit any known namespaces then we will
         * have simply delivered an empty result stanza, which should be ok.
@@ -131,5 +148,3 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
        cprintf("</iq>");
 
 }
-
-#endif /* HAVE_EXPAT */