X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fextnotify%2Fextnotify_main.c;h=aa85ab610fdc9d05317f588bf7632ad1d9320069;hb=0428f9c321bffd2afbd5c41c1170b74d240a5c64;hp=c303e04b4fb1d0d21c0c63312c87ee1bb64b8e77;hpb=9a886d4cd276a30ee62c868c6e6ea280bbbaaaee;p=citadel.git

diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index c303e04b4..aa85ab610 100644
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -8,23 +8,24 @@
  * Based on bits of serv_funambol
  * Contact: <matt@mcbridematt.dhs.org> / <matt@comalies>
  *
- * Copyright (c) 2008-2009
+ * Copyright (c) 2008-2011
  *
- *  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 open source 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.
+ * 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
+ * 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"
 #include <stdlib.h>
 #include <unistd.h>
@@ -65,7 +66,6 @@
 #include "clientsocket.h"
 #include "event_client.h"
 #include "extnotify.h"
-
 #include "ctdl_module.h"
 
 struct CitContext extnotify_queue_CC;
@@ -119,9 +119,9 @@ int GetNotifyHosts(NotifyContext *Ctx)
 		pchs = ChrPtr(Host);
 		pche = strchr(pchs, ':');
 		if (pche == NULL) {
-			CtdlLogPrintf(CTDL_ERR, 
-				      "extnotify: filename of notification template not found in %s.\n", 
-				      pchs);
+			syslog(LOG_ERR, 
+			       "extnotify: filename of notification template not found in %s.\n", 
+			       pchs);
 			continue;
 		}
 		File = GetNHBuf(notify * 2 + 1, 1, Ctx->NotifyHostList);
@@ -133,6 +133,7 @@ int GetNotifyHosts(NotifyContext *Ctx)
 }
 
 
+
 /*! \brief Get configuration message for pager/funambol system from the
  *			users "My Citadel Config" room
  */
@@ -166,7 +167,7 @@ eNotifyType extNotify_getConfigMessage(char *username, char **PagerNumber, char
 		num_msgs = cdbfr->len / sizeof(long);
 		cdb_free(cdbfr);
 	} else {
-		CtdlLogPrintf(CTDL_DEBUG, "extNotify_getConfigMessage: No config messages found\n");
+		syslog(LOG_DEBUG, "extNotify_getConfigMessage: No config messages found\n");
 		return eNone;	/* No messages at all?  No further action. */
 	}
 	for (a = 0; a < num_msgs; ++a) {
@@ -354,13 +355,9 @@ void process_notify(long NotifyMsgnum, void *usrdata)
 	CtdlDeleteMessages(FNBL_QUEUE_ROOM, todelete, 1, "");
 }
 
-
-
-
-
-
 /*!
  * \brief Run through the pager room queue
+ * Checks to see what notification option the user has set
  */
 void do_extnotify_queue(void) 
 {
@@ -378,26 +375,25 @@ void do_extnotify_queue(void)
 	if (IsEmptyStr(config.c_pager_program) && 
 	    IsEmptyStr(config.c_funambol_host))
 	{
-		CtdlLogPrintf(CTDL_DEBUG, "No external notifiers configured on system/user\n");
+		syslog(LOG_ERR, "No external notifiers configured on system/user\n");
 		return;
 	}
 
 	if (doing_queue) return;
 	doing_queue = 1;
 
-	citthread_setspecific(MyConKey, (void *)&extnotify_queue_CC);
+	pthread_setspecific(MyConKey, (void *)&extnotify_queue_CC);
 
 	/*
 	 * Go ahead and run the queue
 	 */
-	CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: processing notify queue\n");
+	syslog(LOG_DEBUG, "serv_extnotify: processing notify queue\n");
 
 	memset(&Ctx, 0, sizeof(NotifyContext));
 	if ((GetNotifyHosts(&Ctx) > 0) && 
 	    (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0))
 	{
-		CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
-		CtdlClearSystemContext();
+		syslog(LOG_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
 		if (Ctx.nNotifyHosts > 0)
 		{
 			for (i = 0; i < Ctx.nNotifyHosts * 2; i++)
@@ -408,7 +404,7 @@ void do_extnotify_queue(void)
 	}
 	CtdlForEachMessage(MSGS_ALL, 0L, NULL,
 			   SPOOLMIME, NULL, process_notify, &Ctx);
-	CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
+	syslog(LOG_DEBUG, "serv_extnotify: queue run completed\n");
 	doing_queue = 0;
 	if (Ctx.nNotifyHosts > 0)
 	{
@@ -443,6 +439,7 @@ void create_extnotify_queue(void) {
 	}
 }
 
+
 CTDL_MODULE_INIT(extnotify)
 {
 	if (!threading)
@@ -450,6 +447,6 @@ CTDL_MODULE_INIT(extnotify)
 		create_extnotify_queue();
 		CtdlRegisterSessionHook(do_extnotify_queue, EVT_TIMER);
 	}
-	/* return our Subversion id for the Log */
+	/* return our module name for the log */
         return "extnotify";
 }