* Fixed mail to "sysop"

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 147a7a482541ccbbd433bbf541e05c98840f01e9..ef338a2416bff4402dc0b77b43ebe5aeedd9ca87 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.33  2002/01/03 22:01:17  ajc
+ * Fixed mail to "sysop"
+
  Revision 590.32  2002/01/03 21:35:07  ajc
  * I think this is the last of the fixes for the new submit queue.
 
@@ -3058,4 +3061,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 7add467a52a02f69ff6f6adce4e15468e537e324..afbb717ff6b5f6589d8d0c6b689b0b2b06cdeca5 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1858,10 +1858,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,      /* message to save */
                extract(recipient, recps->recp_local, i);
                lprintf(9, "Delivering private local mail to <%s>\n",
                        recipient);
-               if (!strcasecmp(recipient, "sysop")) {
-                       CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
-               }
-               else if (getuser(&userbuf, recipient) == 0) {
+               if (getuser(&userbuf, recipient) == 0) {
                        MailboxName(actual_rm, &userbuf, MAILROOM);
                        CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
                }
@@ -2213,7 +2210,15 @@ struct recptypes *validate_recipients(char *recipients) {
                invalid = 0;
                switch(mailtype) {
                        case MES_LOCAL:
-                               if (getuser(&tempUS, this_recp) == 0) {
+                               if (!strcasecmp(this_recp, "sysop")) {
+                                       ++ret->num_room;
+                                       strcpy(this_recp, AIDEROOM);
+                                       if (strlen(ret->recp_room) > 0) {
+                                               strcat(ret->recp_room, "|");
+                                       }
+                                       strcat(ret->recp_room, this_recp);
+                               }
+                               else if (getuser(&tempUS, this_recp) == 0) {
                                        ++ret->num_local;
                                        strcpy(this_recp, tempUS.fullname);
                                        if (strlen(ret->recp_local) > 0) {