X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_misc.c;h=c5c7dfbbd03acda001efb2317ee0e2a2f176c292;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=d75db8a34448c19bfb8255a9f9af6d51c0d2dc7c;hpb=a605e70c6ecfccfe650a85ef4a32ebbf9cd4385f;p=citadel.git diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c index d75db8a34..c5c7dfbbd 100644 --- a/citadel/modules/imap/imap_misc.c +++ b/citadel/modules/imap/imap_misc.c @@ -2,6 +2,22 @@ * $Id$ * * + * + * Copyright (c) 2001-2009 by the citadel.org team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * 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 */ @@ -30,6 +46,7 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "sysdep_decls.h" @@ -41,14 +58,13 @@ #include "policy.h" #include "database.h" #include "msgbase.h" -#include "tools.h" #include "internet_addressing.h" #include "serv_imap.h" #include "imap_tools.h" #include "imap_fetch.h" #include "imap_misc.h" #include "genstamp.h" - +#include "ctdl_module.h" @@ -69,7 +85,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); /* @@ -85,7 +101,7 @@ int imap_do_copy(char *destination_folder) { } if (num_selected > 0) { - CtdlCopyMsgsToRoom(selected_msgs, num_selected, roomname); + CtdlSaveMsgPointersInRoom(roomname, selected_msgs, num_selected, 1, NULL); } free(selected_msgs); @@ -144,6 +160,35 @@ int imap_do_copy(char *destination_folder) { } +/* + * Output the [COPYUID xxx yyy] response code required by RFC2359 + * to tell the client the UID's of the messages that were copied (if any). + * We are assuming that the IMAP_SELECTED flag is still set on any relevant + * messages in our source room. Since the Citadel system uses UID's that + * are both globally unique and persistent across a room-to-room copy, we + * can get this done quite easily. + */ +void imap_output_copyuid_response(void) { + int i; + int num_output = 0; + + for (i = 0; i < IMAP->num_msgs; ++i) { + if (IMAP->flags[i] & IMAP_SELECTED) { + ++num_output; + if (num_output == 1) { + cprintf("[COPYUID "); + } + else if (num_output > 1) { + cprintf(","); + } + cprintf("%ld", IMAP->msgids[i]); + } + } + if (num_output > 0) { + cprintf("] "); + } +} + /* * This function is called by the main command loop. @@ -166,7 +211,9 @@ void imap_copy(int num_parms, char *parms[]) { ret = imap_do_copy(parms[3]); if (!ret) { - cprintf("%s OK COPY completed\r\n", parms[0]); + cprintf("%s OK ", parms[0]); + imap_output_copyuid_response(); + cprintf("COPY completed\r\n"); } else { cprintf("%s NO COPY failed (error %d)\r\n", parms[0], ret); @@ -192,7 +239,9 @@ void imap_uidcopy(int num_parms, char *parms[]) { } if (imap_do_copy(parms[4]) == 0) { - cprintf("%s OK UID COPY completed\r\n", parms[0]); + cprintf("%s OK ", parms[0]); + imap_output_copyuid_response(); + cprintf("UID COPY completed\r\n"); } else { cprintf("%s NO UID COPY failed\r\n", parms[0]); @@ -200,77 +249,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. @@ -318,6 +296,7 @@ void imap_append(int num_parms, char *parms[]) { int msgs, new; int i; char new_message_flags[SIZ]; + struct citimap *Imap; if (num_parms < 4) { cprintf("%s BAD usage error\r\n", parms[0]); @@ -352,20 +331,21 @@ void imap_append(int num_parms, char *parms[]) { return; } + Imap = IMAP; imap_free_transmitted_message(); /* just in case. */ - IMAP->transmitted_message = malloc(literal_length + 1); - if (IMAP->transmitted_message == NULL) { + 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; + Imap->transmitted_length = literal_length; cprintf("+ Transmit message now.\r\n"); bytes_transferred = 0; - ret = client_read(IMAP->transmitted_message, literal_length); - IMAP->transmitted_message[literal_length] = 0; + 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]); @@ -379,23 +359,23 @@ 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; itransmitted_message[i], "\r\n", 2)) { - IMAP->transmitted_message[stripped_length++] = - IMAP->transmitted_message[i]; + 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 */ + Imap->transmitted_message[literal_length] = 0; /* reterminate it */ - lprintf(CTDL_DEBUG, "Converting message format\n"); - msg = convert_internet_message(IMAP->transmitted_message); - IMAP->transmitted_message = NULL; - IMAP->transmitted_length = 0; + 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]); @@ -406,7 +386,7 @@ void imap_append(int num_parms, char *parms[]) { * usergoto() formally takes us to the desired room. (If another * folder is selected, save its name so we can return there!!!!!) */ - if (IMAP->selected) { + if (Imap->selected) { strcpy(savedroom, CC->room.QRname); } usergoto(roomname, 0, 0, &msgs, &new); @@ -419,7 +399,7 @@ void imap_append(int num_parms, char *parms[]) { * private mailboxes. */ if (CC->logged_in) { - if ( (CC->room.QRflags & QR_MAILBOX) == 0) { + if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 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']); @@ -432,7 +412,7 @@ void imap_append(int num_parms, char *parms[]) { /* * Can we post here? */ - ret = CtdlDoIHavePermissionToPostInThisRoom(buf, sizeof buf); + ret = CtdlDoIHavePermissionToPostInThisRoom(buf, sizeof buf, NULL, POST_LOGGED_IN); if (ret) { /* Nope ... print an error message */ @@ -442,7 +422,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", @@ -460,7 +440,7 @@ void imap_append(int num_parms, char *parms[]) { * If another folder is selected, go back to that room so we can resume * our happy day without violent explosions. */ - if (IMAP->selected) { + if (Imap->selected) { usergoto(savedroom, 0, 0, &msgs, &new); }