HFreeStrBuf);
}
-
-
-
StrBuf* GetNHBuf(int i, int allocit, StrBuf **NotifyHostList)
{
if ((NotifyHostList[i] == NULL) && (allocit != 0))
pche = strchr(pchs, ':');
if (pche == NULL) {
CtdlLogPrintf(CTDL_ERR,
- __FILE__": filename not found in %s.\n",
+ "extnotify: filename of notification template not found in %s.\n",
pchs);
continue;
}
}
-/* Create the notify message queue. We use the exact same room
- * as the Funambol module.
- *
- * Run at server startup, creates FNBL_QUEUE_ROOM if it doesn't exist
- * and sets as system room.
- */
-void create_extnotify_queue(void) {
- struct ctdlroom qrbuf;
-
- CtdlCreateRoom(FNBL_QUEUE_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
-
- /*
- * Make sure it's set to be a "system room" so it doesn't show up
- * in the <K>nown rooms list for Aides.
- */
- if (CtdlGetRoomLock(&qrbuf, FNBL_QUEUE_ROOM) == 0) {
- qrbuf.QRflags2 |= QR2_SYSTEM;
- CtdlPutRoomLock(&qrbuf);
- }
-}
-/*!
- * \brief Run through the pager room queue
+/*! \brief Get configuration message for pager/funambol system from the
+ * users "My Citadel Config" room
*/
-void do_extnotify_queue(void)
+eNotifyType extNotify_getConfigMessage(char *username, char **PagerNumber, char **FreeMe)
{
+ struct ctdlroom qrbuf; // scratch for room
+ struct ctdluser user; // ctdl user instance
+ char configRoomName[ROOMNAMELEN];
+ struct CtdlMessage *msg = NULL;
+ struct cdbdata *cdbfr;
+ long *msglist = NULL;
+ int num_msgs = 0;
+ int a;
+ char *configMsg;
+ char *pch;
- NotifyContext Ctx;
- static int doing_queue = 0;
- //int i = 0;
+ // Get the user
+ CtdlGetUser(&user, username);
- /*
- * This is a simple concurrency check to make sure only one queue run
- * is done at a time. We could do this with a mutex, but since we
- * don't really require extremely fine granularity here, we'll do it
- * with a static variable instead.
- */
- if (doing_queue) return;
- doing_queue = 1;
+ CtdlMailboxName(configRoomName, sizeof configRoomName, &user, USERCONFIGROOM);
+ // Fill qrbuf
+ CtdlGetRoom(&qrbuf, configRoomName);
+ /* Do something really, really stoopid here. Raid the room on ourselves,
+ * loop through the messages manually and find it. I don't want
+ * to use a CtdlForEachMessage callback here, as we would be
+ * already in one */
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* CtdlForEachMessage() now owns this memory */
+ num_msgs = cdbfr->len / sizeof(long);
+ cdb_free(cdbfr);
+ } else {
+ CtdlLogPrintf(CTDL_DEBUG, "extNotify_getConfigMessage: No config messages found\n");
+ return eNone; /* No messages at all? No further action. */
+ }
+ for (a = 0; a < num_msgs; ++a) {
+ msg = CtdlFetchMessage(msglist[a], 1);
+ if (msg != NULL) {
+ if ((msg->cm_fields['U'] != NULL) &&
+ (strncasecmp(msg->cm_fields['U'], PAGER_CONFIG_MESSAGE,
+ strlen(PAGER_CONFIG_MESSAGE)) == 0)) {
+ break;
+ }
+ CtdlFreeMessage(msg);
+ msg = NULL;
+ }
+ }
+
+ if (msg == NULL)
+ return eNone;
- /*
- * Go ahead and run the queue
+ // Do a simple string search to see if 'funambol' is selected as the
+ // type. This string would be at the very top of the message contents.
+
+ configMsg = msg->cm_fields['M'];
+ msg->cm_fields['M'] = NULL;
+ CtdlFreeMessage(msg);
+
+ /* here we would find the pager number... */
+ pch = strchr(configMsg, '\n');
+ if (pch != NULL)
+ {
+ *pch = '\0';
+ pch ++;
+ }
+
+ /* Check to see if:
+ * 1. The user has configured paging / They have and disabled it
+ * AND 2. There is an external pager program
+ * 3. A Funambol server has been entered
+ *
*/
- CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: processing notify queue\n");
-
- memset(&Ctx, 0, sizeof(NotifyContext));
- Ctx.NotifyHostList = GetNotifyHosts();
- if (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0) {
- CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
- CtdlClearSystemContext();
- return;
+ if (!strncasecmp(configMsg, "none", 4))
+ {
+ free(configMsg);
+ return eNone;
}
- CtdlForEachMessage(MSGS_ALL, 0L, NULL,
- SPOOLMIME, NULL, process_notify, &Ctx);
-/*
- while ((Ctx.NotifyHostList != NULL) && (Ctx.NotifyHostList[i] != NULL))
- FreeStrBuf(&Ctx.NotifyHostList[i]);
- if (Ctx.NotifyErrors != NULL)
+ if (!strncasecmp(configMsg, HKEY(PAGER_CONFIG_HTTP)))
{
- long len;
- const char *Key;
- HashPos *It;
- void *vErr;
- StrBuf *ErrMsg;
-
- It = GetNewHashPos(Ctx.NotifyErrors, 0);
- while (GetNextHashPos(Ctx.NotifyErrors, It, &len, &Key, &vErr) &&
- (vErr != NULL)) {
- ErrMsg = (StrBuf*) vErr;
- quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(ErrMsg), FMT_FIXED,
- "Failed to notify external service about inbound mail");
+ free(configMsg);
+ return eHttpMessages;
+ }
+ if (!strncasecmp(configMsg, HKEY(FUNAMBOL_CONFIG_TEXT)))
+ {
+ free(configMsg);
+ return eFunambol;
+ }
+ else if (!strncasecmp(configMsg, HKEY(PAGER_CONFIG_SYSTEM)))
+ {
+ // whats the pager number?
+ if (!pch || (*pch == '\0'))
+ {
+ free(configMsg);
+
+ return eNone;
}
-
- DeleteHashPos(&It);
- DeleteHash(&Ctx.NotifyErrors);
+ while (isspace(*pch))
+ pch ++;
+ *PagerNumber = pch;
+ while (isdigit(*pch) || (*pch == '+'))
+ pch++;
+ *pch = '\0';
+ *FreeMe = configMsg;
+ return eTextMessage;
}
-*/
- CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
- doing_queue = 0;
+
+ free(configMsg);
+ return eNone;
}
+
/*
* Process messages in the external notification queue
*/
NotifyContext *Ctx;
long msgnum = 0;
long todelete[1];
- int fnblAllowed;
- int extPagerAllowedHttp;
- int extPagerAllowedSystem;
char *pch;
- long configMsgNum;
- char configMsg[SIZ];
struct CtdlMessage *msg;
+ eNotifyType Type;
+ char remoteurl[SIZ];
+ char *FreeMe = NULL;
+ char *PagerNo;
Ctx = (NotifyContext*) usrdata;
msg = CtdlFetchMessage(NotifyMsgnum, 1);
- if ( msg->cm_fields['W'] == NULL) {
- goto nuke;
- }
-
- configMsgNum = extNotify_getConfigMessage(msg->cm_fields['W']);
-
- extNotify_getPrefs(configMsgNum, &configMsg[0]);
+ if ( msg->cm_fields['W'] != NULL)
+ {
+ Type = extNotify_getConfigMessage(msg->cm_fields['W'], &PagerNo, &FreeMe);
- /* Check to see if:
- * 1. The user has configured paging / They have and disabled it
- * AND 2. There is an external pager program
- * 3. A Funambol server has been entered
- *
- */
- if ((configMsgNum == -1) ||
- ((strncasecmp(configMsg, "none", 4) == 0) &&
- IsEmptyStr(config.c_pager_program) &&
- IsEmptyStr(config.c_funambol_host))) {
- CtdlLogPrintf(CTDL_DEBUG, "No external notifiers configured on system/user");
- goto nuke;
- }
+ pch = strstr(msg->cm_fields['M'], "msgid|");
+ if (pch != NULL)
+ msgnum = atol(pch + sizeof("msgid"));
- // Can Funambol take the message?
- pch = strchr(configMsg, '\n');
- if (*pch == '\n')
- *pch = '\0';
- fnblAllowed = strncasecmp(configMsg, HKEY(FUNAMBOL_CONFIG_TEXT));
- extPagerAllowedHttp = strncasecmp(configMsg, HKEY(PAGER_CONFIG_HTTP));
- extPagerAllowedSystem = strncasecmp(configMsg, HKEY(PAGER_CONFIG_SYSTEM));
- pch = strstr(msg->cm_fields['M'], "msgid|");
- if (pch != NULL)
- msgnum = atol(pch + sizeof("msgid"));
- if (fnblAllowed == 0) {
- char remoteurl[SIZ];
- snprintf(remoteurl, SIZ, "http://%s@%s:%d/%s",
- config.c_funambol_auth,
- config.c_funambol_host,
- config.c_funambol_port,
- FUNAMBOL_WS);
- notify_http_server(remoteurl,
- file_funambol_msg,
- strlen(file_funambol_msg),/*GNA*/
- msg->cm_fields['W'],
- msg->cm_fields['I'],
- msgnum,
- Ctx);
- } else if (extPagerAllowedHttp == 0) {
- int i = 0;
- StrBuf *URL;
- char URLBuf[SIZ];
- StrBuf *File;
- StrBuf *FileBuf = NewStrBuf();
-
- while(1)
+ switch (Type)
{
-
- URL = GetNHBuf(i*2, 0, Ctx->NotifyHostList);
- if (URL==NULL) break;
- File = GetNHBuf(i*2 + 1, 0, Ctx->NotifyHostList);
- if (File==NULL) break;
-
- if (StrLength(File)>0)
- StrBufPrintf(FileBuf, "%s/%s",
- ctdl_shared_dir,
- ChrPtr(File));
- else
- FlushStrBuf(FileBuf);
- memcpy(URLBuf, ChrPtr(URL), StrLength(URL) + 1);
-
- notify_http_server(URLBuf,
- ChrPtr(FileBuf),
- StrLength(FileBuf),
+ case eFunambol:
+ snprintf(remoteurl, SIZ, "http://%s@%s:%d/%s",
+ config.c_funambol_auth,
+ config.c_funambol_host,
+ config.c_funambol_port,
+ FUNAMBOL_WS);
+ notify_http_server(remoteurl,
+ file_funambol_msg,
+ strlen(file_funambol_msg),/*GNA*/
msg->cm_fields['W'],
msg->cm_fields['I'],
msgnum,
Ctx);
- i++;
+ break;
+ case eHttpMessages:
+ {
+ int i = 0;
+ StrBuf *URL;
+ char URLBuf[SIZ];
+ StrBuf *File;
+ StrBuf *FileBuf = NewStrBuf();
+
+ while(1)
+ {
+
+ URL = GetNHBuf(i*2, 0, Ctx->NotifyHostList);
+ if (URL==NULL) break;
+ File = GetNHBuf(i*2 + 1, 0, Ctx->NotifyHostList);
+ if (File==NULL) break;
+
+ if (StrLength(File)>0)
+ StrBufPrintf(FileBuf, "%s/%s",
+ ctdl_shared_dir,
+ ChrPtr(File));
+ else
+ FlushStrBuf(FileBuf);
+ memcpy(URLBuf, ChrPtr(URL), StrLength(URL) + 1);
+
+ notify_http_server(URLBuf,
+ ChrPtr(FileBuf),
+ StrLength(FileBuf),
+ msg->cm_fields['W'],
+ msg->cm_fields['I'],
+ msgnum,
+ Ctx);
+ i++;
+ }
+ FreeStrBuf(&FileBuf);
+ }
+ break;
+ case eTextMessage:
+ {
+ int commandSiz;
+ char *command;
+
+ commandSiz = sizeof(config.c_pager_program) + strlen(PagerNo) + strlen(msg->cm_fields['W']) + 5;
+ command = malloc(commandSiz);
+ snprintf(command, commandSiz, "%s %s -u %s", config.c_pager_program, PagerNo, msg->cm_fields['W']);
+ system(command);
+ free(command);
+ }
+ break;
+ case eNone:
+ break;
}
- FreeStrBuf(&FileBuf);
- }
- else if (extPagerAllowedSystem == 0) {
- char *number;
- int commandSiz;
- char *command;
-
- number = strtok(configMsg, "textmessage\n");
- commandSiz = sizeof(config.c_pager_program) + strlen(number) + strlen(msg->cm_fields['W']) + 5;
- command = malloc(commandSiz);
- snprintf(command, commandSiz, "%s %s -u %s", config.c_pager_program, number, msg->cm_fields['W']);
- system(command);
- free(command);
}
-nuke:
+ if (FreeMe != NULL)
+ free(FreeMe);
CtdlFreeMessage(msg);
- memset(configMsg, 0, sizeof(configMsg));
todelete[0] = NotifyMsgnum;
CtdlDeleteMessages(FNBL_QUEUE_ROOM, todelete, 1, "");
}
-/*! \brief Checks to see what notification option the user has set
- *
+
+
+
+
+
+/*!
+ * \brief Run through the pager room queue
*/
-void extNotify_getPrefs(long configMsgNum, char *configMsg)
+void do_extnotify_queue(void)
{
- struct CtdlMessage *prefMsg;
- // Do a simple string search to see if 'funambol' is selected as the
- // type. This string would be at the very top of the message contents.
- if (configMsgNum == -1) {
- CtdlLogPrintf(CTDL_ERR, "extNotify_isAllowedByPrefs was passed a non-existant config message id\n");
+
+ NotifyContext Ctx;
+ static int doing_queue = 0;
+ //int i = 0;
+
+ /*
+ * This is a simple concurrency check to make sure only one queue run
+ * is done at a time. We could do this with a mutex, but since we
+ * 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))
+ {
+ CtdlLogPrintf(CTDL_DEBUG, "No external notifiers configured on system/user");
return;
}
- prefMsg = CtdlFetchMessage(configMsgNum, 1);
- strncpy(configMsg, prefMsg->cm_fields['M'], strlen(prefMsg->cm_fields['M']));
- CtdlFreeMessage(prefMsg);
-}
-/*! \brief Get configuration message for pager/funambol system from the
- * users "My Citadel Config" room
- */
-long extNotify_getConfigMessage(char *username) {
- struct ctdlroom qrbuf; // scratch for room
- struct ctdluser user; // ctdl user instance
- char configRoomName[ROOMNAMELEN];
- struct CtdlMessage *msg;
- struct cdbdata *cdbfr;
- long *msglist = NULL;
- int num_msgs = 0;
- long confMsgNum = -1;
- int a;
+ if (doing_queue) return;
+ doing_queue = 1;
- // Get the user
- CtdlGetUser(&user, username);
+ /*
+ * Go ahead and run the queue
+ */
+ CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: processing notify queue\n");
- CtdlMailboxName(configRoomName, sizeof configRoomName, &user, USERCONFIGROOM);
- // Fill qrbuf
- CtdlGetRoom(&qrbuf, configRoomName);
- /* Do something really, really stoopid here. Raid the room on ourselves,
- * loop through the messages manually and find it. I don't want
- * to use a CtdlForEachMessage callback here, as we would be
- * already in one */
- cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
- if (cdbfr != NULL) {
- msglist = (long *) cdbfr->ptr;
- cdbfr->ptr = NULL; /* CtdlForEachMessage() now owns this memory */
- num_msgs = cdbfr->len / sizeof(long);
- cdb_free(cdbfr);
- } else {
- CtdlLogPrintf(CTDL_DEBUG, "extNotify_getConfigMessage: No config messages found\n");
- return -1; /* No messages at all? No further action. */
- }
- for (a = 0; a < num_msgs; ++a) {
- msg = CtdlFetchMessage(msglist[a], 1);
- if (msg != NULL) {
- if ((msg->cm_fields['U'] != NULL) &&
- (strncasecmp(msg->cm_fields['U'], PAGER_CONFIG_MESSAGE,
- strlen(PAGER_CONFIG_MESSAGE)) == 0)) {
- confMsgNum = msglist[a];
- }
- CtdlFreeMessage(msg);
- }
+ memset(&Ctx, 0, sizeof(NotifyContext));
+ Ctx.NotifyHostList = GetNotifyHosts();
+ if (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0) {
+ CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
+ CtdlClearSystemContext();
+ return;
}
- return confMsgNum;
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL,
+ SPOOLMIME, NULL, process_notify, &Ctx);
+ CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
+ doing_queue = 0;
+}
+
+
+
+/* Create the notify message queue. We use the exact same room
+ * as the Funambol module.
+ *
+ * Run at server startup, creates FNBL_QUEUE_ROOM if it doesn't exist
+ * and sets as system room.
+ */
+void create_extnotify_queue(void) {
+ struct ctdlroom qrbuf;
+ CtdlCreateRoom(FNBL_QUEUE_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
+
+ /*
+ * Make sure it's set to be a "system room" so it doesn't show up
+ * in the <K>nown rooms list for Aides.
+ */
+ if (CtdlGetRoomLock(&qrbuf, FNBL_QUEUE_ROOM) == 0) {
+ qrbuf.QRflags2 |= QR2_SYSTEM;
+ CtdlPutRoomLock(&qrbuf);
+ }
}
CTDL_MODULE_INIT(extnotify)
projects / citadel.git / commitdiff