/*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
*
* 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
* 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
*/
* 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 ");
+ if (StrLength(MsgsCopied) > 0) {
+ StrBufAppendBufPlain(MsgsCopied, HKEY(","), 0);
}
- else if (num_output > 1) {
- IAPuts(",");
- }
- 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 {
IUnbuffer ();
- 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) */
- IMAPM_syslog(LOG_DEBUG, "Converting CRLF to LF");
+ syslog(LOG_DEBUG, "Converting CRLF to LF");
StrBufToUnixLF(Imap->TransmittedMessage);
- IMAPM_syslog(LOG_DEBUG, "Converting message format");
+ syslog(LOG_DEBUG, "Converting message format");
msg = convert_internet_message_buf(&Imap->TransmittedMessage);
ret = imap_grabroom(roomname, Params[2].Key, 1);
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 (CCC->logged_in) {
- if ( ((CCC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 0)) {
-
- CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
- CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
- CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
- }
+ if ( ((CCC->room.QRflags & QR_MAILBOX) == 0) && (CtdlGetConfigInt("c_imap_keep_from") == 0))
+ {
+ CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+ CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
+ }
}
/*