X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fextnotify%2Fextnotify_main.c;fp=citadel%2Fmodules%2Fextnotify%2Fextnotify_main.c;h=38b6ef1fa19cd1e65ac25dc16f9be541255d5aff;hp=8eafc036a61b09e39fbbd54583cc2768dd59e10c;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hpb=c8c89455faeb5a76d6ee2264f497b8f790e0e392

diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index 8eafc036a..38b6ef1fa 100644
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -8,7 +8,7 @@
  * Based on bits of serv_funambol
  * Contact: <matt@mcbridematt.dhs.org> / <matt@comalies>
  *
- * Copyright (c) 2008-2011
+ * Copyright (c) 2008-2015
  *
  * 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
@@ -19,10 +19,6 @@
  * 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
  */
 
 
@@ -184,7 +180,7 @@ eNotifyType extNotify_getConfigMessage(char *username,
 		return eNone;	/* No messages at all?  No further action. */
 	}
 	for (a = 0; a < num_msgs; ++a) {
-		msg = CtdlFetchMessage(msglist[a], 1);
+		msg = CtdlFetchMessage(msglist[a], 1, 1);
 		if (msg != NULL) {
 			if (!CM_IsEmpty(msg, eMsgSubject) &&
 			    (strncasecmp(msg->cm_fields[eMsgSubject],
@@ -279,7 +275,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
 
 	Ctx = (NotifyContext*) usrdata;
 
-	msg = CtdlFetchMessage(NotifyMsgnum, 1);
+	msg = CtdlFetchMessage(NotifyMsgnum, 1, 1);
 	if (!CM_IsEmpty(msg, eExtnotify))
 	{
 		Type = extNotify_getConfigMessage(
@@ -295,9 +291,9 @@ void process_notify(long NotifyMsgnum, void *usrdata)
 		{
 		case eFunambol:
 			snprintf(remoteurl, SIZ, "http://%s@%s:%d/%s",
-				 config.c_funambol_auth,
-				 config.c_funambol_host,
-				 config.c_funambol_port,
+				 CtdlGetConfigStr("c_funambol_auth"),
+				 CtdlGetConfigStr("c_funambol_host"),
+				 CtdlGetConfigInt("c_funambol_port"),
 				 FUNAMBOL_WS);
 
 			notify_http_server(remoteurl,
@@ -349,7 +345,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
 			int commandSiz;
 			char *command;
 
-			commandSiz = sizeof(config.c_pager_program) +
+			commandSiz = sizeof(CtdlGetConfigStr("c_pager_program")) +
 				strlen(PagerNo) +
 				msg->cm_lengths[eExtnotify] + 5;
 
@@ -358,7 +354,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
 			snprintf(command,
 				 commandSiz,
 				 "%s %s -u %s",
-				 config.c_pager_program,
+				 CtdlGetConfigStr("c_pager_program"),
 				 PagerNo,
 				 msg->cm_fields[eExtnotify]);
 
@@ -393,8 +389,8 @@ void do_extnotify_queue(void)
 	 * don't really require extremely fine granularity here, we'll do it
 	 * with a static variable instead.
 	 */
-	if (IsEmptyStr(config.c_pager_program) &&
-	    IsEmptyStr(config.c_funambol_host))
+	if (IsEmptyStr(CtdlGetConfigStr("c_pager_program")) &&
+	    IsEmptyStr(CtdlGetConfigStr("c_funambol_host")))
 	{
 		syslog(LOG_ERR,
 		       "No external notifiers configured on system/user\n");
@@ -472,7 +468,7 @@ int extnotify_after_mbox_save(struct CtdlMessage *msg,
 	/* If this is private, local mail, make a copy in the
 	 * recipient's mailbox and bump the reference count.
 	 */
-	if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program))
+	if (!IsEmptyStr(CtdlGetConfigStr("c_funambol_host")) || !IsEmptyStr(CtdlGetConfigStr("c_pager_program")))
 	{
 		/* Generate a instruction message for the Funambol notification
 		 * server, in the same style as the SMTP queue