X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.h;h=39e274630eb2380237101bce6868ae4b8351a73f;hb=9d6ac635379521753572f0641718f58f154b2aa3;hp=9786cfd3f16edc65dae67300b7b596833b15279c;hpb=f95401b73d6f0c34dd00639be58fa8731e6959e9;p=citadel.git

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 9786cfd3f..39e274630 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -3,7 +3,6 @@
 #ifndef MSGBASE_H
 #define MSGBASE_H
 
-#define aide_message(text, subject)      quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject)
 
 enum {
 	MSGS_ALL,
@@ -151,19 +150,21 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 		  int flags		/* should the bessage be exported clean? */
 );
 
-#define QP_EADDR (1<<0)
-#define CRLF (1<<1)
-#define ESC_DOT (1<<2)
+/* Flags which may be passed to CtdlOutputMsg() and CtdlOutputPreLoadedMsg() */
+#define QP_EADDR	(1<<0)		/* quoted-printable encode email addresses */
+#define CRLF		(1<<1)
+#define ESC_DOT		(1<<2)		/* output a line containing only "." as ".." instead */
+#define SUPPRESS_ENV_TO	(1<<3)		/* suppress Envelope-to: header (warning: destructive!) */
 
 int CtdlOutputPreLoadedMsg(struct CtdlMessage *,
 			   int mode,		/* how would you like that message? */
 			   int headers_only,	/* eschew the message body? */
-			   int do_proto,		/* do Citadel protocol responses? */
+			   int do_proto,	/* do Citadel protocol responses? */
 			   int crlf,		/* 0=LF, 1=CRLF */
 			   int flags		/* should the bessage be exported clean? */
 );
-int CtdlCopyMsgsToRoom(long *msgnum, int num_msgs, char *dest);
 int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void);
+int CtdlDoIHavePermissionToReadMessagesInThisRoom(void);
 
 enum {
 	POST_LOGGED_IN,
@@ -210,4 +211,13 @@ struct CtdlMessage *CtdlMakeMessage(
 int CtdlCheckInternetMailPermission(struct ctdluser *who);
 int CtdlIsMe(char *addr, int addr_buf_len);
 
+/*
+ * Use of aide_message is deprecated.
+ * It has been replaced with CtdlAideMessage.
+ * All parameters remain the same.
+*/
+void aide_message(char *text, char *subject) __attribute__ ((deprecated));
+
+
+
 #endif /* MSGBASE_H */