- port to Cygwin (DLL support, etc.)

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index edff3d93a18c0f7d018301febe55680839750fc6..afe54a979099c22e2206c67a8146dd72a5b7033e 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -14,22 +14,30 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
+#include "dynloader.h"
 #include <syslog.h>
 #include "serv_chat.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
 #include "tools.h"
 #include "msgbase.h"
 #include "user_ops.h"
@@ -38,7 +46,6 @@
 struct ChatLine *ChatQueue = NULL;
 int ChatLastMsg = 0;
 
-extern struct CitContext *ContextList;
 
 
 
@@ -506,7 +513,6 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        struct savelist *sl = NULL;     /* list of rooms to save this page */
        struct savelist *sptr;
        struct CtdlMessage *logmsg;
-       char roomname[ROOMNAMELEN];
        long msgnum;
 
        if (strlen(x_msg) > 0) {
@@ -570,15 +576,26 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                logmsg->cm_fields['R'] = strdoop(x_user);
                logmsg->cm_fields['M'] = strdoop(x_msg);
 
-               MailboxName(roomname, &CC->usersupp, PAGELOGROOM);
-               create_room(roomname, 4, "", 0);
-               msgnum = CtdlSaveMsg(logmsg, "", roomname, MES_LOCAL);
+
+               /* Save a copy of the message in the sender's log room,
+                * creating the room if necessary.
+                */
+               create_room(PAGELOGROOM, 4, "", 0, 1);
+               msgnum = CtdlSaveMsg(logmsg, "", PAGELOGROOM, MES_LOCAL);
+
+               /* Now save a copy in the global log room, if configured */
                if (strlen(config.c_logpages) > 0) {
-                       create_room(config.c_logpages, 3, "", 0);
+                       create_room(config.c_logpages, 3, "", 0, 1);
                        CtdlSaveMsgPointerInRoom(config.c_logpages, msgnum, 0);
                }
+
+               /* Save a copy in each recipient's log room, creating those
+                * rooms if necessary.  Note that we create as a type 5 room
+                * rather than 4, which indicates that it's a personal room
+                * but we've already supplied the namespace prefix.
+                */
                while (sl != NULL) {
-                       create_room(sl->roomname, 4, "", 0);
+                       create_room(sl->roomname, 5, "", 0, 1);
                        CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0);
                        sptr = sl->next;
                        phree(sl);