#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <ctype.h>
#include <string.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include <time.h>
#include "sysdep_decls.h"
#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);
}
void imap_print_express_messages(void) {
struct ExpressMessage *ptr, *holdptr;
char *dumpomatic = NULL;
+ char tmp[SIZ];
int i;
+ size_t size, size2;
+ struct tm *stamp;
if (CC->FirstExpressMessage == NULL) {
return;
end_critical_section(S_SESSION_TABLE);
while (ptr != NULL) {
- dumpomatic = mallok(strlen(ptr->text) + SIZ);
+ stamp = localtime(&(ptr->timestamp));
+ size = strlen(ptr->text) + SIZ;
+ dumpomatic = mallok(size);
strcpy(dumpomatic, "");
if (ptr->flags && EM_BROADCAST)
strcat(dumpomatic, "Broadcast message ");
strcat(dumpomatic, "Please logoff now, as requested ");
else
strcat(dumpomatic, "Message ");
- sprintf(&dumpomatic[strlen(dumpomatic)],
- "from %s:\n", ptr->sender);
+
+ /* Timestamp. Can this be improved? */
+ 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 */
+ sprintf(tmp, "at %d:%02dpm",
+ stamp->tm_hour - 12,
+ stamp->tm_min);
+ else /* am */
+ sprintf(tmp, "at %d:%02dam",
+ stamp->tm_hour, stamp->tm_min);
+ strcat(dumpomatic, tmp);
+
+ size2 = strlen(dumpomatic);
+ snprintf(&dumpomatic[size2], size - size2,
+ " from %s:\n", ptr->sender);
if (ptr->text != NULL)
strcat(dumpomatic, ptr->text);
*/
void imap_append(int num_parms, char *parms[]) {
size_t literal_length;
+ struct CtdlMessage *msg;
int ret;
+ char roomname[ROOMNAMELEN];
+ char buf[SIZ];
+ char savedroom[ROOMNAMELEN];
+ int msgs, new;
+ int i;
+
if (num_parms < 4) {
cprintf("%s BAD usage error\r\n", parms[0]);
}
imap_free_transmitted_message(); /* just in case. */
- IMAP->transmitted_message = mallok(literal_length);
+ IMAP->transmitted_message = mallok(literal_length + 1);
if (IMAP->transmitted_message == NULL) {
cprintf("%s NO Cannot allocate memory.\r\n", parms[0]);
return;
cprintf("+ Transmit message now.\r\n");
ret = client_read(IMAP->transmitted_message, literal_length);
+ IMAP->transmitted_message[literal_length] = 0;
if (ret != 1) {
cprintf("%s NO Read failed.\r\n", parms[0]);
return;
}
- cprintf("%s NO not implemented yet ** FIXME ** \r\n", parms[0]);
+ /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
+ lprintf(CTDL_DEBUG, "Converting newline format\n");
+ 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;
+ }
+ }
+
+ lprintf(CTDL_DEBUG, "Converting message format\n");
+ msg = convert_internet_message(IMAP->transmitted_message);
+ IMAP->transmitted_message = NULL;
+ IMAP->transmitted_length = 0;
+
+ ret = imap_grabroom(roomname, parms[2]);
+ if (ret != 0) {
+ cprintf("%s NO Invalid mailbox name or location, or access denied\r\n",
+ parms[0]);
+ return;
+ }
+
+ /*
+ * usergoto() formally takes us to the desired room. (If another
+ * folder is selected, save its name so we can return there!!!!!)
+ */
+ if (IMAP->selected) {
+ 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) 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->user.fullname);
+ msg->cm_fields['N'] = strdoop(config.c_nodename);
+ msg->cm_fields['H'] = strdoop(config.c_humannode);
+ }
+ }
+
+ /*
+ * Can we post here?
+ */
+ ret = CtdlDoIHavePermissionToPostInThisRoom(buf, sizeof buf);
+
+ if (ret) {
+ /* Nope ... print an error message */
+ cprintf("%s NO %s\r\n", parms[0], buf);
+ }
+
+ else {
+ /* Yes ... go ahead and post! */
+ if (msg != NULL) {
+ CtdlSubmitMsg(msg, NULL, "");
+ }
+ cprintf("%s OK APPEND completed\r\n", parms[0]);
+ }
+
+ /*
+ * IMAP protocol response to client has already been sent by now.
+ *
+ * If another folder is selected, go back to that room so we can resume
+ * our happy day without violent explosions.
+ */
+ if (IMAP->selected) {
+ usergoto(savedroom, 0, 0, &msgs, &new);
+ }
+
+ /* We don't need this buffer anymore */
+ CtdlFreeMessage(msg);
}
projects / citadel.git / blobdiff