* Set zapped_ok to 1 on nearly all calls to imap_grabroom(), because the IMAP command...

[citadel.git] / citadel / modules / imap / imap_misc.c

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index eacb44e6fc82be44cca6cf203b087e74120a0f0f..5d40f8503821b13b16013e773c2668f2edcd78dc 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -48,7 +48,7 @@
 #include "imap_fetch.h"
 #include "imap_misc.h"
 #include "genstamp.h"
-
+#include "ctdl_module.h"
 
 
 
@@ -69,7 +69,7 @@ int imap_do_copy(char *destination_folder) {
                return(0);
        }
 
-       i = imap_grabroom(roomname, destination_folder, 0);
+       i = imap_grabroom(roomname, destination_folder, 1);
        if (i != 0) return(i);
 
        /*
@@ -233,77 +233,6 @@ void imap_uidcopy(int num_parms, char *parms[]) {
 }
 
 
-/*
- * Poll for instant messages (yeah, we can do this in IMAP ... I think)
- */
-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;
-
-       if (CC->FirstExpressMessage == NULL) {
-               return;
-       }
-       begin_critical_section(S_SESSION_TABLE);
-       ptr = CC->FirstExpressMessage;
-       CC->FirstExpressMessage = NULL;
-       end_critical_section(S_SESSION_TABLE);
-
-       while (ptr != NULL) {
-               localtime_r(&(ptr->timestamp), &stamp);
-               size = strlen(ptr->text) + SIZ;
-               dumpomatic = malloc(size);
-               strcpy(dumpomatic, "");
-               if (ptr->flags && EM_BROADCAST)
-                       strcat(dumpomatic, "Broadcast message ");
-               else if (ptr->flags && EM_CHAT)
-                       strcat(dumpomatic, "Chat request ");
-               else if (ptr->flags && EM_GO_AWAY)
-                       strcat(dumpomatic, "Please logoff now, as requested ");
-               else
-                       strcat(dumpomatic, "Message ");
-
-               /* 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);
-
-               holdptr = ptr->next;
-               if (ptr->text != NULL) free(ptr->text);
-               free(ptr);
-               ptr = holdptr;
-
-               for (i=0; dumpomatic[i]; ++i) {
-                       if (!isprint(dumpomatic[i])) dumpomatic[i] = ' ';
-                       if (dumpomatic[i]=='\\') dumpomatic[i]='/';
-                       if (dumpomatic[i]=='\"') dumpomatic[i]='\'';
-               }
-
-               cprintf("* OK [ALERT] %s\r\n", dumpomatic);
-               free(dumpomatic);
-       }
-       cprintf("000\n");
-}
-
-
 /*
  * imap_do_append_flags() is called by imap_append() to set any flags that
  * the client specified at append time.
@@ -414,7 +343,7 @@ void imap_append(int num_parms, char *parms[]) {
        client_getln(buf, sizeof buf);
 
        /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
-       lprintf(CTDL_DEBUG, "Converting CRLF to LF\n");
+       CtdlLogPrintf(CTDL_DEBUG, "Converting CRLF to LF\n");
        stripped_length = 0;
        for (i=0; i<literal_length; ++i) {
                if (strncmp(&Imap->transmitted_message[i], "\r\n", 2)) {
@@ -425,12 +354,12 @@ void imap_append(int num_parms, char *parms[]) {
        literal_length = stripped_length;
        Imap->transmitted_message[literal_length] = 0;  /* reterminate it */
 
-       lprintf(CTDL_DEBUG, "Converting message format\n");
+       CtdlLogPrintf(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], 0);
+       ret = imap_grabroom(roomname, parms[2], 1);
        if (ret != 0) {
                cprintf("%s NO Invalid mailbox name or access denied\r\n",
                        parms[0]);
@@ -477,7 +406,7 @@ void imap_append(int num_parms, char *parms[]) {
        else {
                /* Yes ... go ahead and post! */
                if (msg != NULL) {
-                       new_msgnum = CtdlSubmitMsg(msg, NULL, "");
+                       new_msgnum = CtdlSubmitMsg(msg, NULL, "", 0);
                }
                if (new_msgnum >= 0L) {
                        cprintf("%s OK [APPENDUID %ld %ld] APPEND completed\r\n",