X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_misc.c;h=e7940d1cb95d25e71bd957653a5893e097ca8e23;hb=8eb69231ba08c5e3f275d925c617ceec17d18175;hp=14d2396c7e54480329f006906ca78abb620f0fa2;hpb=5e3befebe2ed0ce85324da3be83b21880dc7d069;p=citadel.git

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 14d2396c7..e7940d1cb 100644
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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,6 +48,7 @@
 #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"
@@ -162,9 +159,10 @@ int imap_do_copy(const char *destination_folder) {
  * 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.
+ *
+ * FIXME this is outputing WRONG !!!   See https://tools.ietf.org/html/rfc2359#section-4.3
  */
-void imap_output_copyuid_response(void) {
-	citimap *Imap = IMAP;
+void imap_output_copyuid_response(citimap *Imap) {
 	int i;
 	int num_output = 0;
   
@@ -208,7 +206,7 @@ void imap_copy(int num_parms, ConstStr *Params) {
 	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 {
@@ -236,7 +234,7 @@ void imap_uidcopy(int num_parms, ConstStr *Params) {
 
 	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 {
@@ -305,7 +303,7 @@ void imap_append(int num_parms, ConstStr *Params) {
 		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);
@@ -340,7 +338,7 @@ void imap_append(int num_parms, ConstStr *Params) {
 	
 	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.");
@@ -354,10 +352,10 @@ void imap_append(int num_parms, ConstStr *Params) {
 	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);
@@ -373,22 +371,18 @@ void imap_append(int num_parms, ConstStr *Params) {
 	if (Imap->selected) {
 		strcpy(savedroom, CCC->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 (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, config.c_nodename, strlen(config.c_nodename));
-		CM_SetField(msg, eHumanNode, config.c_humannode, strlen(config.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")));
+		}
 	}
 
 	/* 
@@ -423,13 +417,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 */
 	CM_Free(msg);
 
-	if (new_message_flags != NULL) {
+	if (IsEmptyStr(new_message_flags)) {
 		imap_do_append_flags(new_msgnum, new_message_flags);
 	}
 }