X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_misc.c;h=c2c953b5b61d3ee1658f32dfdc6c26c9c7ebf340;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=fba0c767ebacc1cf7ad27d59d1b570a04709ac8d;hpb=898b8a51b960cd199a7bb5a45faf480468e37590;p=citadel.git diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c index fba0c767e..c2c953b5b 100644 --- a/citadel/modules/imap/imap_misc.c +++ b/citadel/modules/imap/imap_misc.c @@ -1,7 +1,7 @@ /* - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2020 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source 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. @@ -10,10 +10,6 @@ * 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 */ @@ -52,9 +48,10 @@ #include "user_ops.h" #include "database.h" #include "msgbase.h" +#include "room_ops.h" #include "internet_addressing.h" -#include "imap_tools.h" #include "serv_imap.h" +#include "imap_tools.h" #include "imap_fetch.h" #include "imap_misc.h" #include "genstamp.h" @@ -69,13 +66,14 @@ * validated and boiled down the request a bit. (returns 0 on success) */ int imap_do_copy(const char *destination_folder) { + citimap *Imap = IMAP; int i; char roomname[ROOMNAMELEN]; struct ctdlroom qrbuf; long *selected_msgs = NULL; int num_selected = 0; - if (IMAP->num_msgs < 1) { + if (Imap->num_msgs < 1) { return(0); } @@ -85,12 +83,12 @@ int imap_do_copy(const char *destination_folder) { /* * Copy all the message pointers in one shot. */ - selected_msgs = malloc(sizeof(long) * IMAP->num_msgs); + selected_msgs = malloc(sizeof(long) * Imap->num_msgs); if (selected_msgs == NULL) return(-1); - for (i = 0; i < IMAP->num_msgs; ++i) { - if (IMAP->flags[i] & IMAP_SELECTED) { - selected_msgs[num_selected++] = IMAP->msgids[i]; + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + selected_msgs[num_selected++] = Imap->msgids[i]; } } @@ -119,19 +117,19 @@ int imap_do_copy(const char *destination_folder) { answ_yes = malloc(num_selected * sizeof(long)); answ_no = malloc(num_selected * sizeof(long)); - for (i = 0; i < IMAP->num_msgs; ++i) { - if (IMAP->flags[i] & IMAP_SELECTED) { - if (IMAP->flags[i] & IMAP_SEEN) { - seen_yes[num_seen_yes++] = IMAP->msgids[i]; + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + if (Imap->flags[i] & IMAP_SEEN) { + seen_yes[num_seen_yes++] = Imap->msgids[i]; } - if ((IMAP->flags[i] & IMAP_SEEN) == 0) { - seen_no[num_seen_no++] = IMAP->msgids[i]; + if ((Imap->flags[i] & IMAP_SEEN) == 0) { + seen_no[num_seen_no++] = Imap->msgids[i]; } - if (IMAP->flags[i] & IMAP_ANSWERED) { - answ_yes[num_answ_yes++] = IMAP->msgids[i]; + if (Imap->flags[i] & IMAP_ANSWERED) { + answ_yes[num_answ_yes++] = Imap->msgids[i]; } - if ((IMAP->flags[i] & IMAP_ANSWERED) == 0) { - answ_no[num_answ_no++] = IMAP->msgids[i]; + if ((Imap->flags[i] & IMAP_ANSWERED) == 0) { + answ_no[num_answ_no++] = Imap->msgids[i]; } } } @@ -162,25 +160,24 @@ int imap_do_copy(const char *destination_folder) { * 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) { +void imap_output_copyuid_response(citimap *Imap) { 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(","); + StrBuf *MsgsCopied = NewStrBuf(); + + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + if (StrLength(MsgsCopied) > 0) { + StrBufAppendBufPlain(MsgsCopied, HKEY(","), 0); } - cprintf("%ld", IMAP->msgids[i]); + StrBufAppendPrintf(MsgsCopied, "%ld", Imap->msgids[i]); } } - if (num_output > 0) { - cprintf("] "); + + if (StrLength(MsgsCopied) > 0) { + IAPrintf("[COPYUID %ld %s %s] ", GLOBAL_UIDVALIDITY_VALUE, ChrPtr(MsgsCopied), ChrPtr(MsgsCopied)); } + + FreeStrBuf(&MsgsCopied); } @@ -191,7 +188,7 @@ void imap_copy(int num_parms, ConstStr *Params) { int ret; if (num_parms != 4) { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } @@ -199,18 +196,18 @@ void imap_copy(int num_parms, ConstStr *Params) { imap_pick_range(Params[2].Key, 0); } else { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } ret = imap_do_copy(Params[3].Key); if (!ret) { - cprintf("%s OK ", Params[0].Key); - imap_output_copyuid_response(); - cprintf("COPY completed\r\n"); + IAPrintf("%s OK ", Params[0].Key); + imap_output_copyuid_response(IMAP); + IAPuts("COPY completed\r\n"); } else { - cprintf("%s NO COPY failed (error %d)\r\n", Params[0].Key, ret); + IReplyPrintf("NO COPY failed (error %d)", ret); } } @@ -220,7 +217,7 @@ void imap_copy(int num_parms, ConstStr *Params) { void imap_uidcopy(int num_parms, ConstStr *Params) { if (num_parms != 5) { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } @@ -228,17 +225,17 @@ void imap_uidcopy(int num_parms, ConstStr *Params) { imap_pick_range(Params[3].Key, 1); } else { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } if (imap_do_copy(Params[4].Key) == 0) { - cprintf("%s OK ", Params[0].Key); - imap_output_copyuid_response(); - cprintf("UID COPY completed\r\n"); + IAPrintf("%s OK ", Params[0].Key); + imap_output_copyuid_response(IMAP); + IAPuts("UID COPY completed\r\n"); } else { - cprintf("%s NO UID COPY failed\r\n", Params[0].Key); + IReply("NO UID COPY failed"); } } @@ -279,7 +276,6 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) { */ void imap_append(int num_parms, ConstStr *Params) { long literal_length; - long bytes_transferred; struct CtdlMessage *msg = NULL; long new_msgnum = (-1L); int ret = 0; @@ -293,17 +289,17 @@ void imap_append(int num_parms, ConstStr *Params) { citimap *Imap; if (num_parms < 4) { - cprintf("%s BAD usage error\r\n", Params[0].Key); + IReply("BAD usage error"); return; } if ( (Params[num_parms-1].Key[0] != '{') || (Params[num_parms-1].Key[Params[num_parms-1].len-1] != '}') ) { - cprintf("%s BAD no message literal supplied\r\n", Params[0].Key); + IReply("BAD no message literal supplied"); return; } - strcpy(new_message_flags, ""); + *new_message_flags = '\0'; if (num_parms >= 5) { for (i=3; iTransmittedMessage = NewStrBufPlain(NULL, literal_length); if (Imap->TransmittedMessage == NULL) { - cprintf("%s NO Cannot allocate memory.\r\n", Params[0].Key); + IReply("NO Cannot allocate memory."); return; } - cprintf("+ Transmit message now.\r\n"); + IAPrintf("+ Transmit message now.\r\n"); + + IUnbuffer (); - bytes_transferred = 0; - client_read_blob(Imap->TransmittedMessage, literal_length, config.c_sleeping); + client_read_blob(Imap->TransmittedMessage, literal_length, CtdlGetConfigInt("c_sleeping")); if ((ret < 0) || (StrLength(Imap->TransmittedMessage) < literal_length)) { - cprintf("%s NO Read failed.\r\n", Params[0].Key); + IReply("NO Read failed."); return; } @@ -352,16 +348,15 @@ void imap_append(int num_parms, ConstStr *Params) { client_getln(dummy, sizeof dummy); /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */ - CtdlLogPrintf(CTDL_DEBUG, "Converting CRLF to LF\n"); + syslog(LOG_DEBUG, "Converting CRLF to LF"); StrBufToUnixLF(Imap->TransmittedMessage); - CtdlLogPrintf(CTDL_DEBUG, "Converting message format\n"); + syslog(LOG_DEBUG, "Converting message format"); msg = convert_internet_message_buf(&Imap->TransmittedMessage); ret = imap_grabroom(roomname, Params[2].Key, 1); if (ret != 0) { - cprintf("%s NO Invalid mailbox name or access denied\r\n", - Params[0].Key); + IReply("NO Invalid mailbox name or access denied"); return; } @@ -372,24 +367,16 @@ void imap_append(int num_parms, ConstStr *Params) { if (Imap->selected) { strcpy(savedroom, CC->room.QRname); } - CtdlUserGoto(roomname, 0, 0, &msgs, &new); + CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL); /* 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. + * show up as the real sender. (Configurable setting) */ if (CC->logged_in) { - 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']); - msg->cm_fields['A'] = strdup(CC->user.fullname); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['H'] = strdup(config.c_humannode); - } + if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (CtdlGetConfigInt("c_imap_keep_from") == 0)) + { + CM_SetField(msg, eAuthor, CC->user.fullname, strlen(CC->user.fullname)); + } } /* @@ -399,21 +386,21 @@ void imap_append(int num_parms, ConstStr *Params) { if (ret) { /* Nope ... print an error message */ - cprintf("%s NO %s\r\n", Params[0].Key, errbuf); + IReplyPrintf("NO %s", errbuf); } else { /* Yes ... go ahead and post! */ if (msg != NULL) { - new_msgnum = CtdlSubmitMsg(msg, NULL, "", 0); + new_msgnum = CtdlSubmitMsg(msg, NULL, ""); } if (new_msgnum >= 0L) { - cprintf("%s OK [APPENDUID %ld %ld] APPEND completed\r\n", - Params[0].Key, GLOBAL_UIDVALIDITY_VALUE, new_msgnum); + IReplyPrintf("OK [APPENDUID %ld %ld] APPEND completed", + GLOBAL_UIDVALIDITY_VALUE, new_msgnum); } else { - cprintf("%s BAD Error %ld saving message to disk.\r\n", - Params[0].Key, new_msgnum); + IReplyPrintf("BAD Error %ld saving message to disk.", + new_msgnum); } } @@ -424,13 +411,13 @@ void imap_append(int num_parms, ConstStr *Params) { * our happy day without violent explosions. */ if (Imap->selected) { - CtdlUserGoto(savedroom, 0, 0, &msgs, &new); + CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL); } /* We don't need this buffer anymore */ - CtdlFreeMessage(msg); + CM_Free(msg); - if (new_message_flags != NULL) { + if (IsEmptyStr(new_message_flags)) { imap_do_append_flags(new_msgnum, new_message_flags); } }