de-apify GenerateRoomDisplay(), its only needed in serv_rwho.

[citadel.git] / citadel / modules / rwho / serv_rwho.c

diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 06f439081aa4c69fb9b631233bc5ca2f3b995d35..4c2e28cdc80495e92c7254bdb2d8d84eec588f0a 100644 (file)
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -1,9 +1,17 @@
 /*
- * $Id$
- *
  * This module implements server commands related to the display and
  * manipulation of the "Who's online" list.
  *
+ * Copyright (c) 1987-2012 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
  */
 
 #include "sysdep.h"
@@ -37,21 +45,48 @@
 #include "support.h"
 #include "config.h"
 #include "control.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 
 
 #include "ctdl_module.h"
 
+/* Don't show the names of private rooms unless the viewing
+ * user also knows the rooms.
+ */
+void GenerateRoomDisplay(char *real_room,
+                       CitContext *viewed,
+                       CitContext *viewer) {
+
+       int ra;
+
+       strcpy(real_room, viewed->room.QRname);
+       if (viewed->room.QRflags & QR_MAILBOX) {
+               strcpy(real_room, &real_room[11]);
+       }
+       if (viewed->room.QRflags & QR_PRIVATE) {
+               CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
+               if ( (ra & UA_KNOWN) == 0) {
+                       strcpy(real_room, " ");
+               }
+       }
+
+       if (viewed->cs_flags & CS_CHAT) {
+               while (strlen(real_room) < 14) {
+                       strcat(real_room, " ");
+               }
+               strcpy(&real_room[14], "<chat>");
+       }
+
+}
+
+
 
 /*
  * display who's online
  */
 void cmd_rwho(char *argbuf) {
-       struct CitContext *cptr;
        struct CitContext *nptr;
        int nContexts, i;
        int spoofed = 0;
@@ -66,10 +101,7 @@ void cmd_rwho(char *argbuf) {
        /* So that we don't keep the context list locked for a long time
         * we create a copy of it first
         */
-       
-
-       nContexts = num_sessions;
-       nptr = malloc(sizeof(struct CitContext) * nContexts);
+       nptr = CtdlGetContextArray(&nContexts) ;
        if (!nptr)
        {
                /* Couldn't malloc so we have to bail but stick to the protocol */
@@ -77,14 +109,8 @@ void cmd_rwho(char *argbuf) {
                cprintf("000\n");
                return;
        }
-       begin_critical_section(S_SESSION_TABLE);
-       for (cptr = ContextList, i=0; cptr != NULL && i < nContexts; cptr = cptr->next, i++)
-       {
-               memcpy(&nptr[i], cptr, sizeof (struct CitContext));
-       }
-       end_critical_section (S_SESSION_TABLE);
        
-       aide = CC->user.axlevel >= 6;
+       aide = ( (CC->user.axlevel >= AxAideU) || (CC->internal_pgm) ) ;
        cprintf("%d%c \n", LISTING_FOLLOWS, CtdlCheckExpress() );
        
        for (i=0; i<nContexts; i++) 
@@ -95,6 +121,12 @@ void cmd_rwho(char *argbuf) {
                room_spoofed = 0;
                host_spoofed = 0;
                
+               if (!aide && nptr[i].state == CON_SYS)
+                       continue;
+
+               if (!aide && nptr[i].kill_me != 0)
+                       continue;
+
                if (nptr[i].cs_flags & CS_POSTING)
                   strcat(flags, "*");
                else
@@ -287,6 +319,6 @@ CTDL_MODULE_INIT(rwho)
                CtdlRegisterProtoHook(cmd_stel, "STEL", "Enter/exit stealth mode");
        }
        
-       /* return our Subversion id for the Log */
-        return "$Id$";
+       /* return our module name for the log */
+        return "rwho";
 }