Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 4c2d50ade321a9cdfe4ede9ef1d9de0bc5b5cb0f..a3be435f73e7c3799e8c1ec4775aa61c0916b6d8 100644 (file)
--- 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-2015 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
@@ -67,10 +67,7 @@ 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
+       XMPP_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));
 }
@@ -151,7 +148,7 @@ 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\">",
@@ -161,7 +158,7 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
        );
        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>"
@@ -232,7 +229,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
        char *ptr = NULL;
        char *lasts = NULL;
 
-       msg = CtdlFetchMessage(msgnum, 1);
+       msg = CtdlFetchMessage(msgnum, 1, 1);
        if (msg == NULL) {
                return;
        }
@@ -313,14 +310,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);