Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 37cbfcd6464d2c61253f9107865661a94f30021f..7bc53ce36f6488016388c92b3ca68bb5c5dae0a0 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1587,7 +1587,8 @@ int CtdlInvtKick(char *iuser, int op) {
                iuser,
                ((op == 1) ? "invited to" : "kicked out of"),
                CC->room.QRname,
                iuser,
                ((op == 1) ? "invited to" : "kicked out of"),
                CC->room.QRname,

-               CC->user.fullname);
+               (CC->logged_in ? CC->user.fullname : "an administrator")
+       );

        CtdlAideMessage(bbb,"User Admin Message");
 
        return(0);
        CtdlAideMessage(bbb,"User Admin Message");
 
        return(0);


@@ -1966,7 +1967,9 @@ void cmd_asup(char *cmdbuf)
        if (deleted) {
                snprintf(notify, SIZ, 
                         "User \"%s\" has been deleted by %s.\n",
        if (deleted) {
                snprintf(notify, SIZ, 
                         "User \"%s\" has been deleted by %s.\n",

-                        usbuf.fullname, CC->user.fullname);
+                        usbuf.fullname,
+                       (CC->logged_in ? CC->user.fullname : "an administrator")
+               );

                CtdlAideMessage(notify, "User Deletion Message");
        }
 
                CtdlAideMessage(notify, "User Deletion Message");
        }