#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
if (IMAP->num_msgs > 0) {
for (i = 0; i < IMAP->num_msgs; ++i) {
- if (IMAP->flags[i] && IMAP_SELECTED) {
+ if (IMAP->flags[i] & IMAP_SELECTED) {
CtdlCopyMsgToRoom(
IMAP->msgids[i], roomname);
}
/*
- * Poll for express messages (yeah, we can do this in IMAP ... I think)
+ * Poll for instant messages (yeah, we can do this in IMAP ... I think)
*/
-void imap_print_express_messages(void) {
+void imap_print_instant_messages(void) {
struct ExpressMessage *ptr, *holdptr;
char *dumpomatic = NULL;
char tmp[SIZ];
int i;
size_t size, size2;
- struct tm *stamp;
+ struct tm stamp;
if (CC->FirstExpressMessage == NULL) {
return;
end_critical_section(S_SESSION_TABLE);
while (ptr != NULL) {
- stamp = localtime(&(ptr->timestamp));
+ localtime_r(&(ptr->timestamp), &stamp);
size = strlen(ptr->text) + SIZ;
- dumpomatic = mallok(size);
+ dumpomatic = malloc(size);
strcpy(dumpomatic, "");
if (ptr->flags && EM_BROADCAST)
strcat(dumpomatic, "Broadcast message ");
strcat(dumpomatic, "Message ");
/* Timestamp. Can this be improved? */
- if (stamp->tm_hour == 0 || stamp->tm_hour == 12)
+ if (stamp.tm_hour == 0 || stamp.tm_hour == 12)
sprintf(tmp, "at 12:%02d%cm",
- stamp->tm_min,
- stamp->tm_hour ? 'p' : 'a');
- else if (stamp->tm_hour > 12) /* pm */
+ stamp.tm_min,
+ stamp.tm_hour ? 'p' : 'a');
+ else if (stamp.tm_hour > 12) /* pm */
sprintf(tmp, "at %d:%02dpm",
- stamp->tm_hour - 12,
- stamp->tm_min);
+ stamp.tm_hour - 12,
+ stamp.tm_min);
else /* am */
sprintf(tmp, "at %d:%02dam",
- stamp->tm_hour, stamp->tm_min);
+ stamp.tm_hour, stamp.tm_min);
strcat(dumpomatic, tmp);
size2 = strlen(dumpomatic);
strcat(dumpomatic, ptr->text);
holdptr = ptr->next;
- if (ptr->text != NULL) phree(ptr->text);
- phree(ptr);
+ if (ptr->text != NULL) free(ptr->text);
+ free(ptr);
ptr = holdptr;
for (i=0; i<strlen(dumpomatic); ++i) {
}
cprintf("* OK [ALERT] %s\r\n", dumpomatic);
- phree(dumpomatic);
+ free(dumpomatic);
}
cprintf("000\n");
}
*/
void imap_append(int num_parms, char *parms[]) {
size_t literal_length;
+ size_t bytes_transferred;
+ size_t stripped_length = 0;
struct CtdlMessage *msg;
- int ret;
+ int ret = 0;
+ size_t blksize;
char roomname[ROOMNAMELEN];
char buf[SIZ];
char savedroom[ROOMNAMELEN];
}
imap_free_transmitted_message(); /* just in case. */
- IMAP->transmitted_message = mallok(literal_length + 1);
+ IMAP->transmitted_message = malloc(literal_length + 1);
if (IMAP->transmitted_message == NULL) {
cprintf("%s NO Cannot allocate memory.\r\n", parms[0]);
return;
IMAP->transmitted_length = literal_length;
cprintf("+ Transmit message now.\r\n");
- ret = client_read(IMAP->transmitted_message, literal_length);
+ lprintf(CTDL_DEBUG, "imap_append() expecting %d bytes\n",
+ literal_length);
+
+ bytes_transferred = 0;
+
+ do {
+ blksize = literal_length - bytes_transferred;
+ if (blksize > SIZ) blksize = SIZ;
+
+ flush_output();
+ ret = client_read(&IMAP->transmitted_message[bytes_transferred], blksize);
+ if (ret < 1) {
+ bytes_transferred = literal_length; /* bail out */
+ }
+ else {
+ bytes_transferred += blksize; /* keep going */
+ }
+ lprintf(CTDL_DEBUG, "Received %d of %d bytes (%d%%)\n",
+ bytes_transferred,
+ literal_length,
+ ((bytes_transferred * 100) / literal_length)
+ );
+ } while (bytes_transferred < literal_length);
+
IMAP->transmitted_message[literal_length] = 0;
if (ret != 1) {
cprintf("%s NO Read failed.\r\n", parms[0]);
return;
}
+ lprintf(CTDL_DEBUG, "imap_append() finished reading message\n");
+
+ /* I think there's supposed to be a trailing CRLF after the
+ * literal (the message text) is received. This call to
+ * client_gets() absorbs it.
+ */
+ flush_output();
+ client_gets(buf);
+ lprintf(CTDL_DEBUG, "Trailing CRLF: %s\n", buf);
/* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
- lprintf(9, "Converting newline format\n");
+ lprintf(CTDL_DEBUG, "Converting newline format\n");
+ stripped_length = 0;
for (i=0; i<literal_length; ++i) {
- if (!strncmp(&IMAP->transmitted_message[i], "\r\n", 2)) {
- strcpy(&IMAP->transmitted_message[i],
- &IMAP->transmitted_message[i+1]);
- --literal_length;
+ if (strncmp(&IMAP->transmitted_message[i], "\r\n", 2)) {
+ IMAP->transmitted_message[stripped_length++] = IMAP->transmitted_message[i];
}
}
+ literal_length = stripped_length;
+ IMAP->transmitted_message[literal_length] = 0; /* reterminate it */
- lprintf(9, "Converting message format\n");
+ lprintf(CTDL_DEBUG, "Converting message format\n");
msg = convert_internet_message(IMAP->transmitted_message);
IMAP->transmitted_message = NULL;
IMAP->transmitted_length = 0;
- /* If the user is locally authenticated, FORCE the From: header to
- * show up as the real sender. FIXME do we really want to do this?
- * Probably should make it site-definable or even room-definable.
- */
- if (CC->logged_in) {
- if (msg->cm_fields['A'] != NULL) phree(msg->cm_fields['A']);
- if (msg->cm_fields['N'] != NULL) phree(msg->cm_fields['N']);
- if (msg->cm_fields['H'] != NULL) phree(msg->cm_fields['H']);
- msg->cm_fields['A'] = strdoop(CC->usersupp.fullname);
- msg->cm_fields['N'] = strdoop(config.c_nodename);
- msg->cm_fields['H'] = strdoop(config.c_humannode);
- }
-
ret = imap_grabroom(roomname, parms[2]);
if (ret != 0) {
cprintf("%s NO Invalid mailbox name or location, or access denied\r\n",
* folder is selected, save its name so we can return there!!!!!)
*/
if (IMAP->selected) {
- strcpy(savedroom, CC->quickroom.QRname);
+ strcpy(savedroom, CC->room.QRname);
}
usergoto(roomname, 0, 0, &msgs, &new);
+ /* If the user is locally authenticated, FORCE the From: header to
+ * show up as the real sender. FIXME do we really want to do this?
+ * Probably should make it site-definable or even room-definable.
+ *
+ * For now, we allow "forgeries" if the room is one of the user's
+ * private mailboxes.
+ */
+ if (CC->logged_in) {
+ if ( (CC->room.QRflags & QR_MAILBOX) == 0) {
+ if (msg->cm_fields['A'] != NULL) free(msg->cm_fields['A']);
+ if (msg->cm_fields['N'] != NULL) free(msg->cm_fields['N']);
+ if (msg->cm_fields['H'] != NULL) free(msg->cm_fields['H']);
+ msg->cm_fields['A'] = strdup(CC->user.fullname);
+ msg->cm_fields['N'] = strdup(config.c_nodename);
+ msg->cm_fields['H'] = strdup(config.c_humannode);
+ }
+ }
+
/*
* Can we post here?
*/