X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=8fa6dea7fa6e7cddbf577828ff8db7ed0b47fbbb;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=4c2d50ade321a9cdfe4ede9ef1d9de0bc5b5cb0f;hpb=73bcf6081a14008eb1020126273f133a324bb910;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 4c2d50ade..8fa6dea7f 100644
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,7 +1,7 @@
 /*
  * Handle XMPP presence exchanges
  *
- * Copyright (c) 2007-2010 by Art Cancro
+ * Copyright (c) 2007-2017 by Art Cancro and citadel.org
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,10 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
 
-
 /* 
  * Indicate the presence of another user to the client
  * (used in several places)
@@ -67,16 +65,12 @@ void xmpp_indicate_presence(char *presence_jid)
 {
 	char xmlbuf[256];
 
-<<<<<<< HEAD
-	syslog(LOG_DEBUG, "XMPP: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
-=======
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+	syslog(LOG_DEBUG, "xmpp: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
 	cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
 	cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
 }
 
 
-
 /*
  * Convenience function to determine whether any given session is 'visible' to any other given session,
  * and is capable of receiving instant messages from that session.
@@ -112,7 +106,7 @@ void xmpp_wholist_presence_dump(void)
 
 	for (i=0; i<nContexts; i++) {
 		if (xmpp_is_visible(&cptr[i], CC)) {
-			xmpp_indicate_presence(cptr[i].cs_inet_email);
+			xmpp_indicate_presence(cptr[i].cs_principal_id);
 		}
 	}
 	free(cptr);
@@ -151,17 +145,17 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
 		);
 	}
 
-	// FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
+	// note: we should implement xmpp_indicate_nonpresence so we can use it elsewhere
 
 	/* Do an unsolicited roster update that deletes the contact. */
 	cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
-		xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1),
+		xmlesc(xmlbuf1, CC->cs_principal_id, sizeof xmlbuf1),
 		xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
 		++unsolicited_id
 	);
 	cprintf("<query xmlns=\"jabber:iq:roster\">");
 	cprintf("<item jid=\"%s\" subscription=\"remove\">", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
-	cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+	cprintf("<group>%s</group>", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
 	cprintf("</item>");
 	cprintf("</query>"
 		"</iq>"
@@ -190,7 +184,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
 	/* Count the visible sessions for this user */
 	for (i=0; i<nContexts; i++) {
-		if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+		if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
 		   && (xmpp_is_visible(&cptr[i], CC))
 		)  {
 			++visible_sessions;
@@ -198,11 +192,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 		}
 	}
 
-	syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n", visible_sessions, presence_jid, CC->cs_pid);
+	syslog(LOG_DEBUG, "xmpp: %d sessions for <%s> are now visible to session %d", visible_sessions, presence_jid, CC->cs_pid);
 
 	if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-		syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
+		syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged in", CC->cs_pid, presence_jid);
 
 		/* Do an unsolicited roster update that adds a new contact. */
 		assert(which_cptr_is_relevant >= 0);
@@ -216,8 +210,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 	}
 
 	if (visible_sessions == 0) {
-		syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
-			    CC->cs_pid, presence_jid);
+		syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged out", CC->cs_pid, presence_jid);
 		xmpp_destroy_buddy(presence_jid, 0);	/* non aggressive presence update */
 	}
 
@@ -225,14 +218,13 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 }
 
 
-
 void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 	HashList *mortuary = (HashList *) userdata;
 	struct CtdlMessage *msg;
 	char *ptr = NULL;
 	char *lasts = NULL;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		return;
 	}
@@ -265,7 +257,6 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 }
 
 
-
 /*
  * Fetch the "mortuary" - a list of dead buddies which we keep around forever
  * so we can remove them from any client's roster that still has them listed
@@ -273,7 +264,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 HashList *xmpp_fetch_mortuary(void) {
 	HashList *mortuary = NewHash(1, NULL);
 	if (!mortuary) {
-		syslog(LOG_ALERT, "NewHash() failed!\n");
+		syslog(LOG_ALERT, "xmpp: NewHash() failed!");
 		return(NULL);
 	}
 
@@ -288,7 +279,6 @@ HashList *xmpp_fetch_mortuary(void) {
 }
 
 
-
 /*
  * Fetch the "mortuary" - a list of dead buddies which we keep around forever
  * so we can remove them from any client's roster that still has them listed
@@ -313,14 +303,6 @@ void xmpp_store_mortuary(HashList *mortuary) {
 	}
 	DeleteHashPos(&HashPos);
 
-	/* FIXME temp crap 
-	StrBufAppendPrintf(themsg, "foo@bar.com\n");
-	StrBufAppendPrintf(themsg, "baz@quux.com\n");
-	StrBufAppendPrintf(themsg, "haha%c\n", 1);
-	StrBufAppendPrintf(themsg, "baaaz@quux.com\n");
-	StrBufAppendPrintf(themsg, "baaaz@quuuuuux.com\n");
-	*/
-
 	/* Delete the old mortuary */
 	CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);
 
@@ -330,7 +312,6 @@ void xmpp_store_mortuary(HashList *mortuary) {
 }
 
 
-
 /*
  * Upon logout we make an attempt to delete the whole roster, in order to
  * try to keep "ghost" buddies from remaining in the client-side roster.
@@ -349,7 +330,7 @@ void xmpp_massacre_roster(void)
 		for (i=0; i<nContexts; i++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
 				if (mortuary) {
-					char *buddy = strdup(cptr[i].cs_inet_email);
+					char *buddy = strdup(cptr[i].cs_principal_id);
 					Put(mortuary, buddy, strlen(buddy), buddy, NULL);
 				}
 			}
@@ -364,7 +345,6 @@ void xmpp_massacre_roster(void)
 }
 
 
-
 /*
  * Stupidly, XMPP does not specify a way to tell the client to flush its client-side roster
  * and prepare to receive a new one.  So instead we remember every buddy we've ever told the
@@ -396,7 +376,7 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
 		online_now = 0;
 		if (cptr) for (i=0; i<nContexts; i++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
-				if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+				if (!strcasecmp(cptr[i].cs_principal_id, (char *)Value)) {
 					online_now = 1;
 				}
 			}
@@ -411,4 +391,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
 	DeleteHash(&mortuary);
 	free(cptr);
 }
-