* In the wholist, only show <private room> if the user viewing the list

  doesn't know that room.  Otherwise show the name.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 767e323d71c8d51aaffa718140e592045921df5e..0c88877f6ab4b1d699e49fef4e9df8d2b9362a9f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 1.388  1999/10/20 03:42:29  ajc
+* In the wholist, only show <private room> if the user viewing the list
+  doesn't know that room.  Otherwise show the name.
+
 Revision 1.387  1999/10/20 02:59:22  ajc
 * Code reorganization.  Making it easier to move/copy messages without
   duplicating existing code.
@@ -1324,4 +1328,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 195b42637de6052050b0c939813742fddc84a542..307c7276ca7d035de7b4488d8277d46e4bb63696 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -217,36 +217,6 @@ void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
 
 
 
-/*
- * set_wtmpsupp()  -  alter the session listing
- */
-void set_wtmpsupp(char *newtext)
-{
-       strncpy(CC->cs_room,newtext,sizeof CC->cs_room);
-       CC->cs_room[sizeof CC->cs_room - 1] = 0;
-       time(&CC->cs_lastupdt);
-
-       /* Run any routines registered by loadable modules */
-       PerformSessionHooks(EVT_NEWROOM);
-       }
-
-
-/*
- * call set_wtmpsupp() with the name of the current room, modified a bit...
- */
-void set_wtmpsupp_to_current_room() {
-       if (CC->quickroom.QRflags & QR_PRIVATE) {
-               set_wtmpsupp("<private room>");
-               }
-       else if (CC->quickroom.QRflags & QR_MAILBOX) {
-               set_wtmpsupp(&CC->quickroom.QRname[11]);
-               }
-       else {
-               set_wtmpsupp(CC->quickroom.QRname);
-               }
-       }
-
-
 
 /*
  * cmd_info()  -  tell the client about this server
@@ -441,9 +411,6 @@ void cmd_iden(char *argbuf)
                        }
                }
 
-       lprintf(9, "Setting wtmpsupp\n");
-       set_wtmpsupp_to_current_room();
-
        syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
                dev_code,
                cli_code,
@@ -484,7 +451,6 @@ void cmd_stel(char *cmdbuf)
                        CC->cs_flags = CC->cs_flags|CS_STEALTH;
                }
 
-       set_wtmpsupp_to_current_room();
        cprintf("%d Ok\n",OK);
        }
 
@@ -587,6 +553,31 @@ void cmd_emsg(char *mname)
        }
 
 
+/* Don't show the names of private rooms unless the viewing
+ * user also knows the rooms.
+ */
+void GenerateRoomDisplay(char *real_room,
+                       struct CitContext *viewed,
+                       struct CitContext *viewer) {
+
+       strcpy(real_room, viewed->quickroom.QRname);
+       if (viewed->quickroom.QRflags & QR_PRIVATE) {
+               if ( (CtdlRoomAccess(&viewed->quickroom, &viewer->usersupp)
+                  & UA_KNOWN) == 0) {
+                       strcpy(real_room, "<private room>");
+               }
+       }
+
+       if (viewed->cs_flags & CS_CHAT) {
+               while (strlen(real_room) < 14)
+                       strcat(real_room, " ");
+
+               strcpy(&real_room[15], "<chat>");
+       }
+
+}
+
+
 /*
  * who's online
  */
@@ -594,7 +585,9 @@ void cmd_rwho(void) {
        struct CitContext *cptr;
        int spoofed = 0;
        int aide;
-       char un[40], room[40], host[40], flags[5];
+       char un[40];
+       char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
+       char host[40], flags[5];
        
        aide = CC->usersupp.axlevel >= 6;
        cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
@@ -625,14 +618,15 @@ void cmd_rwho(void) {
                else
                   strcpy(host, cptr->cs_host);
 
-               if (cptr->fake_roomname[0])
-               {
-                  strcpy(room, cptr->fake_roomname);
-                  spoofed = 1;
+               GenerateRoomDisplay(real_room, cptr, CC);
+
+               if (cptr->fake_roomname[0]) {
+                       strcpy(room, cptr->fake_roomname);
+                       spoofed = 1;
+               }
+               else {
+                       strcpy(room, real_room);
                }
-               else
-                  strcpy(room, cptr->cs_room);
-                  
                
                 if ((aide) && (spoofed))
                    strcat(flags, "+");
@@ -651,7 +645,8 @@ void cmd_rwho(void) {
                if ((spoofed) && (aide))
                {
                        cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
-                               cptr->cs_pid, cptr->curr_user, cptr->cs_room,
+                               cptr->cs_pid, cptr->curr_user,
+                               real_room,
                                cptr->cs_host, cptr->cs_clientname,
                                (long)(cptr->lastidle),
                                cptr->lastcmdname, flags);
@@ -831,7 +826,6 @@ void *context_loop(struct CitContext *con)
        strcpy(CC->curr_user,"(not logged in)");
        strcpy(CC->net_node,"");
        snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
-       strcpy(CC->cs_room, "(no room)");
        strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
        CC->cs_host[sizeof CC->cs_host - 1] = 0;
        len = sizeof sin;

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 61b8326472ba21cc8879df8815795f6e38621d51..53a7801f2da9d887755c3dc9db846beb8f544172 100644 (file)
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -28,6 +28,9 @@ void *CtdlGetUserData(unsigned long requested_sym);
 void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes);
 int CtdlGetDynamicSymbol(void);
 void enter_housekeeping_cmd(char *);
+void GenerateRoomDisplay(char *real_room,
+                        struct CitContext *viewed,
+                        struct CitContext *viewer);
 
 
 extern int do_defrag;

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index ebf81401ef0891a660cc2be0dfb6be6783704676..753e863cd6600a2157d0b78d71497a0f68a4bc44 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -679,7 +679,6 @@ void usergoto(char *where, int display_result)
                        rmailflag, raideflag, newmailcount,
                        CC->quickroom.QRfloor);
 
-       set_wtmpsupp_to_current_room();
 }
 
 

diff --git a/citadel/room_ops.h b/citadel/room_ops.h
index 537bea4a121347c2d2409aad2cf8c8dba623e51e..3325dda871ecda56737dbb7550d8351bde371b53 100644 (file)
--- a/citadel/room_ops.h
+++ b/citadel/room_ops.h
@@ -46,3 +46,4 @@ void assoc_file_name(char *buf, struct quickroom *qrbuf, char *prefix);
 void delete_room(struct quickroom *qrbuf);
 void list_roomname(struct quickroom *qrbuf);
 int is_noneditable(struct quickroom *qrbuf);
+int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf);

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 9a3813f7d204e585f9be473804b202fdb2886d9b..8328259a301bc808645cc3c45b1e926bdc07fa01 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -159,13 +159,14 @@ void do_chat_listing(int allflag)
 {
        struct CitContext *ccptr;
        int count = 0;
+       char roomname[ROOMNAMELEN];
 
        if ((allflag == 0) || (allflag == 1))
                cprintf(":|\n:| Users currently in chat:\n");
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-               if (!strcasecmp(ccptr->cs_room, "<chat>")) ++count;
-               if ((!strcasecmp(ccptr->cs_room, "<chat>"))
+               if (ccptr->cs_flags & CS_CHAT) ++count;
+               if ((ccptr->cs_flags & CS_CHAT)
                    && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
                        if ((allflag == 0) || (allflag == 1))
                                cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
@@ -175,9 +176,12 @@ void do_chat_listing(int allflag)
        if (allflag == 1) {
                cprintf(":|\n:| Users not in chat:\n");
                for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-                       if ((strcasecmp(ccptr->cs_room, "<chat>"))
+                       GenerateRoomDisplay(roomname, ccptr, CC);
+                       if (((ccptr->cs_flags & CS_CHAT) == 0)
                            && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
-                               cprintf(":| %-25s <%s>:\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, (ccptr->fake_roomname[0]) ? ccptr->fake_roomname : ccptr->cs_room);
+                               cprintf(":| %-25s <%s>:\n",
+                                       (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user,
+                                       roomname);
                        }
                }
        }
@@ -199,7 +203,6 @@ void cmd_chat(char *argbuf)
        char cmdbuf[256];
        char *un;
        char *strptr1;
-       char hold_cs_room[ROOMNAMELEN];
        int MyLastMsg, ThisLastMsg;
        struct ChatLine *clptr;
        struct CitContext *t_context;
@@ -211,9 +214,7 @@ void cmd_chat(char *argbuf)
        }
        strcpy(CC->chat_room, "Main room");
 
-       safestrncpy(hold_cs_room, CC->cs_room, sizeof hold_cs_room);
        CC->cs_flags = CC->cs_flags | CS_CHAT;
-       set_wtmpsupp("<chat>");
        cprintf("%d Entering chat mode (type '/help' for available commands)\n",
                START_CHAT_MODE);
 
@@ -258,7 +259,6 @@ void cmd_chat(char *argbuf)
                                        sleep(1);
                                        cprintf("000\n");
                                        CC->cs_flags = CC->cs_flags - CS_CHAT;
-                                       set_wtmpsupp(hold_cs_room);
                                        return;
                                }
                                if ((!strcasecmp(cmdbuf, "/help"))

diff --git a/citadel/serv_test.c b/citadel/serv_test.c
index 8da2e2e474eb857a5f18855c1dcb0a5138f1ba3b..7601cf21540c6bab709ec79e613b6e38236a6efa 100644 (file)
--- a/citadel/serv_test.c
+++ b/citadel/serv_test.c
@@ -36,8 +36,7 @@ void CleanupTest(void) {
        }
 
 void NewRoomTest(void) {
-       lprintf(9, "--- test module was told we're now in %s ---\n",
-               CC->cs_room);
+       lprintf(9, "--- test module was told we're now in a new room ---\n");
        }
 
 void SessionStartTest(void) {

diff --git a/citadel/server.h b/citadel/server.h
index 82113952da3b5eec272d77ac60ab4ba2d0ebc861..2f977a9d9c0dc230e01912114c95ce110da27e47 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -67,7 +67,6 @@ struct CitContext {
        int n_crit;             /* number of critical sections open */
        int client_socket;
        int cs_pid;             /* session ID */
-       char cs_room[ROOMNAMELEN];      /* current room */
        time_t cs_lastupdt;     /* time of last update */
        time_t lastcmd;         /* time of last command executed */
        time_t lastidle;        /* For computing idle time */