* Bugfixes

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index a87c01a4d7a677f75b94f32c99ed97f4255d2609..cfa6aa7f5b1d768c871afe9ef6415bd912d13a81 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#define aide_message(text)      quickie_message("Citadel",NULL,AIDEROOM,text)
+#define aide_message(text)      quickie_message("Citadel",NULL,AIDEROOM,text,0,NULL)
 
 #define MSGS_ALL        0
 #define MSGS_OLD        1
@@ -8,6 +8,7 @@
 #define MSGS_FIRST      3
 #define MSGS_LAST       4
 #define MSGS_GT         5
+#define MSGS_EQ                6
 
 /*
  * Flags which may be passed to CtdlSaveMsgPointerInRoom()
@@ -27,22 +28,45 @@ enum {
        om_no_such_msg,
        om_mime_error
 };
-       
+
+/*
+ * Values of "headers_only" when calling message output routines
+ */
+#define HEADERS_ALL    0       /* Headers and body */
+#define        HEADERS_ONLY    1       /* Headers only */
+#define        HEADERS_NONE    2       /* Body only */
 
 
 struct ma_info {
-       char prefix[256];       /* Prefix for a multipart/alternative */
        int is_ma;              /* Set to 1 if we are using this stuff */
        int did_print;          /* One alternative has been displayed */
+       char chosen_part[SIZ];  /* Which part of a m/a did we choose? */
 };
 
 
 struct repl {                  /* Info for replication checking */
-       char extended_id[256];
+       char extended_id[SIZ];
        time_t highest;
 };
 
 
+/* Data structure returned by validate_recipients() */
+struct recptypes {
+        int num_local;
+        int num_internet;
+        int num_ignet;
+       int num_room;
+        int num_error;
+       char errormsg[SIZ];
+       char recp_local[SIZ];
+       char recp_internet[SIZ];
+       char recp_ignet[SIZ];
+       char recp_room[SIZ];
+       char display_recp[SIZ];
+};
+
+
+
 int alias (char *name);
 void get_mm (void);
 void cmd_msgs (char *cmdbuf);
@@ -54,26 +78,25 @@ void cmd_msg0 (char *cmdbuf);
 void cmd_msg2 (char *cmdbuf);
 void cmd_msg3 (char *cmdbuf);
 void cmd_msg4 (char *cmdbuf);
+void cmd_msgp (char *cmdbuf);
 void cmd_opna (char *cmdbuf);
 long send_message (struct CtdlMessage *, FILE *);
 void loadtroom (void);
-long CtdlSaveMsg(struct CtdlMessage *, char *, char *, int);
-void quickie_message (char *, char *, char *, char *);
-struct CtdlMessage *make_message (struct usersupp *, char *,
-                  char *, int, int, int, char *);
+long CtdlSubmitMsg(struct CtdlMessage *, struct recptypes *, char *);
+void quickie_message (char *, char *, char *, char *, int, char *);
 void cmd_ent0 (char *entargs);
-void cmd_ent3 (char *entargs);
 void cmd_dele (char *delstr);
 void cmd_move (char *args);
-void GetSuppMsgInfo(struct SuppMsgInfo *, long);
-void PutSuppMsgInfo(struct SuppMsgInfo *);
+void GetMetaData(struct MetaData *, long);
+void PutMetaData(struct MetaData *);
 void AdjRefCount(long, int);
-void simple_listing(long);
+void simple_listing(long, void *);
 int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template);
-void CtdlForEachMessage(int mode, long ref,
+int CtdlForEachMessage(int mode, long ref,
                        char *content_type,
                        struct CtdlMessage *compare,
-                        void (*CallBack) (long msgnum) );
+                        void (*CallBack) (long, void *),
+                       void *userdata);
 int CtdlDeleteMessages(char *, long, char *);
 void CtdlWriteObject(char *, char *, char *, struct usersupp *,
                        int, int, unsigned int);
@@ -91,3 +114,15 @@ int CtdlOutputMsg(long msg_num,             /* message number (local) to fetch */
                int headers_only,       /* eschew the message body? */
                int do_proto,           /* do Citadel protocol responses? */
                int crlf);
+int CtdlOutputPreLoadedMsg(struct CtdlMessage *,
+               long,
+               int mode,               /* how would you like that message? */
+               int headers_only,       /* eschew the message body? */
+               int do_proto,           /* do Citadel protocol responses? */
+               int crlf);
+int CtdlCopyMsgToRoom(long msgnum, char *dest);
+int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void);
+int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, size_t n);
+void CtdlSetSeen(long target_msgnum, int target_setting);
+struct recptypes *validate_recipients(char *recipients);
+void CtdlGetSeen(char *buf);