* New server command-line option "-l" to send log output to the host

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 11c7b634c3580b90d8dd06b2c488f576360fd290..71dc3fc2acbfe7abac81b4a5a1fc59c902bf9f6c 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -29,7 +29,6 @@
 
 #include <ctype.h>
 #include <string.h>
-#include <syslog.h>
 #include <limits.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -1319,7 +1318,13 @@ int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
 
                PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
 
-               if (strlen(fuser) > 0) {
+               if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONONLY)) {
+                       cprintf("From: x@x.org (----)%s", nl);
+               }
+               else if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONOPT)) {
+                       cprintf("From: x@x.org (anonymous)%s", nl);
+               }
+               else if (strlen(fuser) > 0) {
                        cprintf("From: %s (%s)%s", fuser, luser, nl);
                }
                else {
@@ -1977,7 +1982,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Goto the correct room */
-       lprintf(9, "Switching rooms\n");
+       lprintf(9, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS);
        strcpy(hold_rm, CC->room.QRname);
        strcpy(actual_rm, CC->room.QRname);
        if (recps != NULL) {
@@ -1985,7 +1990,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* If the user is a twit, move to the twit room for posting */
-       lprintf(9, "Handling twit stuff\n");
+       lprintf(9, "Handling twit stuff: %s\n",
+                       (CC->user.axlevel == 2) ? config.c_twitroom : "OK");
        if (TWITDETECT) {
                if (CC->user.axlevel == 2) {
                        strcpy(hold_rm, actual_rm);
@@ -1998,7 +2004,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
                strcpy(actual_rm, force_room);
        }
 
-       lprintf(9, "Possibly relocating\n");
+       lprintf(9, "Final selection: %s\n", actual_rm);
        if (strcasecmp(actual_rm, CC->room.QRname)) {
                getroom(&CC->room, actual_rm);
        }
@@ -2133,7 +2139,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Go back to the room we started from */
-       lprintf(9, "Returning to original room\n");
+       lprintf(9, "Returning to original room %s\n", hold_rm);
        if (strcasecmp(hold_rm, CC->room.QRname))
                getroom(&CC->room, hold_rm);