/*
- * 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.
* 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
*/
#include "user_ops.h"
#include "database.h"
#include "msgbase.h"
+#include "room_ops.h"
#include "internet_addressing.h"
#include "serv_imap.h"
#include "imap_tools.h"
* 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) {
- citimap *Imap = IMAP;
+void imap_output_copyuid_response(citimap *Imap) {
int i;
- int num_output = 0;
-
+ StrBuf *MsgsCopied = NewStrBuf();
+
for (i = 0; i < Imap->num_msgs; ++i) {
if (Imap->flags[i] & IMAP_SELECTED) {
- ++num_output;
- if (num_output == 1) {
- IAPuts("[COPYUID ");
- }
- else if (num_output > 1) {
- IAPuts(",");
+ if (StrLength(MsgsCopied) > 0) {
+ StrBufAppendBufPlain(MsgsCopied, HKEY(","), 0);
}
- IAPrintf("%ld", Imap->msgids[i]);
+ StrBufAppendPrintf(MsgsCopied, "%ld", Imap->msgids[i]);
}
}
- if (num_output > 0) {
- IAPuts("] ");
+
+ if (StrLength(MsgsCopied) > 0) {
+ IAPrintf("[COPYUID %ld %s %s] ", GLOBAL_UIDVALIDITY_VALUE, ChrPtr(MsgsCopied), ChrPtr(MsgsCopied));
}
+
+ FreeStrBuf(&MsgsCopied);
}
ret = imap_do_copy(Params[3].Key);
if (!ret) {
IAPrintf("%s OK ", Params[0].Key);
- imap_output_copyuid_response();
+ imap_output_copyuid_response(IMAP);
IAPuts("COPY completed\r\n");
}
else {
if (imap_do_copy(Params[4].Key) == 0) {
IAPrintf("%s OK ", Params[0].Key);
- imap_output_copyuid_response();
+ imap_output_copyuid_response(IMAP);
IAPuts("UID COPY completed\r\n");
}
else {
*/
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;
return;
}
- strcpy(new_message_flags, "");
+ *new_message_flags = '\0';
if (num_parms >= 5) {
for (i=3; i<num_parms; ++i) {
strcat(new_message_flags, Params[i].Key);
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)) {
IReply("NO Read failed.");
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 (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));
+ }
}
/*
* 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);
}
}
projects / citadel.git / blobdiff