* serv_chat.c: Differentiate when a user does not exist when paging users.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 96936001dd7850192c11b23bd6c8b8d797ec4b9b..24575e1daa720ee65fe164f0892af8b58a2199e4 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 620.9  2004/04/09 23:11:01  error
+ * serv_chat.c: Differentiate when a user does not exist when paging users.
+
  Revision 620.8  2004/04/09 23:05:52  error
  * user_ops.c: fix unused variable compiler warnings
 
@@ -5667,4 +5670,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/serv_chat.c b/citadel/serv_chat.c
index 9baeaac74d6aecd4bf0f253aaa66b1b6b7468734..a88f97258a134c36215c45c919410749e6985c59 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -688,9 +688,13 @@ void cmd_sexp(char *argbuf)
        if (!strcmp(x_msg, "-")) {
                message_sent = PerformXmsgHooks(lun, x_user, "");
                if (message_sent == 0) {
-                       cprintf("%d '%s' is not logged in "
-                               "or is not accepting pages.\n",
-                               ERROR + NO_SUCH_USER, x_user);
+                       if (getuser(NULL, x_user))
+                               cprintf("%d '%s' does not exist.\n",
+                                               ERROR + NO_SUCH_USER, x_user);
+                       else
+                               cprintf("%d '%s' is not logged in "
+                                               "or is not accepting pages.\n",
+                                               ERROR + RESOURCE_NOT_OPEN, x_user);
                        return;
                }
                cprintf("%d Transmit message (will deliver to %d users)\n",
@@ -721,9 +725,13 @@ void cmd_sexp(char *argbuf)
                                cprintf(" to %d users", message_sent);
                        cprintf(".\n");
                } else {
-                       cprintf("%d '%s' is not logged in "
-                               "or is not accepting pages.\n",
-                               ERROR + NO_SUCH_USER, x_user);
+                       if (getuser(NULL, x_user))
+                               cprintf("%d '%s' does not exist.\n",
+                                               ERROR + NO_SUCH_USER, x_user);
+                       else
+                               cprintf("%d '%s' is not logged in "
+                                               "or is not accepting pages.\n",
+                                               ERROR + RESOURCE_NOT_OPEN, x_user);
                }
 
 

diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt
index 0e7a22b00b2fde9bf74719c42bba16ccd608c291..010f8188dd07643235e558206657adfa55426666 100644 (file)
--- a/citadel/techdoc/session.txt
+++ b/citadel/techdoc/session.txt
@@ -1472,7 +1472,8 @@ broadcast an express message to all users currently connected to the server.
 
  Do be aware that if an express message is transmitted to a user who is logged
 in using a client that does not check for express messages, the message will
-never be received.
+never be received.  Also, express messages are NOT sent via the following
+transports:  SMTP, POP3.
 
 
  PEXP   (Print EXPress messages)   ***DEPRECATED***