* More license declarations

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

diff --git a/citadel/modules/jabber/xmpp_presence.c b/citadel/modules/jabber/xmpp_presence.c
index 0855cc89892c4b59e40de39ba301debb1eefa24a..96b4504b8ba9a267448342e106a699728359ca13 100644 (file)
--- a/citadel/modules/jabber/xmpp_presence.c
+++ b/citadel/modules/jabber/xmpp_presence.c
@@ -3,8 +3,21 @@
  *
  * Handle XMPP presence exchanges
  *
- * 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
  *
  */
 
@@ -33,6 +46,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -42,9 +56,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 
@@ -65,8 +76,9 @@ void jabber_wholist_presence_dump(void)
        for (i=0; i<nContexts; i++) {
                if (cptr[i].logged_in) {
                        if (
-                          (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))               /* aides see everyone */
-                          && (cptr[i].user.usernum != CC->user.usernum)                /* don't show myself */
+                               (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))  /* aides see everyone */
+                               && (cptr[i].user.usernum != CC->user.usernum)   /* don't show myself */
+                               && (cptr[i].can_receive_im)                     /* IM-capable session */
                           ) {
                                cprintf("<presence type=\"available\" from=\"%s\"></presence>",
                                        cptr[i].cs_inet_email);
@@ -98,20 +110,22 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        /* Count the visible sessions for this user */
        for (i=0; i<nContexts; i++) {
                if (cptr[i].logged_in) {
-                       if (  (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) 
-                          && (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
-                          ) {
+                       if (
+                               (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) 
+                               && (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
+                               && (cptr[i].can_receive_im)
+                       ) {
                                ++visible_sessions;
                        }
                }
        }
 
-       lprintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
+       CtdlLogPrintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
                visible_sessions, presence_jid, CC->cs_pid);
 
        if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-               lprintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
+               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
 
                /* Do an unsolicited roster update that adds a new contact. */
                for (i=0; i<nContexts; i++) {
@@ -132,7 +146,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        }
 
        if (visible_sessions == 0) {
-               lprintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n", CC->cs_pid, presence_jid);
+               CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n", CC->cs_pid, presence_jid);
 
                /* Transmit non-presence information */
                cprintf("<presence type=\"unavailable\" from=\"%s\"></presence>", presence_jid);
@@ -149,6 +163,3 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        }
        free(cptr);
 }
-
-
-#endif /* HAVE_EXPAT */