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

[citadel.git] / citadel / modules / roomchat / serv_roomchat.c

diff --git a/citadel/modules/roomchat/serv_roomchat.c b/citadel/modules/roomchat/serv_roomchat.c
index c1a08c56617040b574f61a5aa4c5da7afcfc0b6d..b0a7ccda43234414b596d6a4d9a97284e6c7373e 100644 (file)
--- a/citadel/modules/roomchat/serv_roomchat.c
+++ b/citadel/modules/roomchat/serv_roomchat.c
@@ -1,23 +1,21 @@
 /*
- * $Id$
- *
  * This module handles instant messaging between users.
  * 
- * Copyright (c) 2010 by the citadel.org team
+ * Copyright (c) 2012 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * 
+ * 
  *
  */
 #include "sysdep.h"
@@ -174,7 +172,7 @@ void roomchat_poll(char *argbuf) {
 
        newer_than = extract_int(argbuf, 1);
 
-       if (!CC->cs_flags & CS_CHAT) {
+       if ((CC->cs_flags & CS_CHAT) == 0) {
                cprintf("%d Session is not in chat mode.\n", ERROR);
                return;
        }
@@ -198,6 +196,38 @@ void roomchat_poll(char *argbuf) {
 }
 
 
+
+/*
+ * list users in chat in this room
+ */
+void roomchat_rwho(char *argbuf) {
+       struct CitContext *nptr;
+       int nContexts, i;
+
+       if ((CC->cs_flags & CS_CHAT) == 0) {
+               cprintf("%d Session is not in chat mode.\n", ERROR);
+               return;
+       }
+
+       cprintf("%d%c \n", LISTING_FOLLOWS, CtdlCheckExpress() );
+       
+       nptr = CtdlGetContextArray(&nContexts) ;                // grab a copy of the wholist
+       if (nptr) {
+               for (i=0; i<nContexts; i++)  {                  // list the users
+                       if ( (nptr[i].room.QRnumber == CC->room.QRnumber) 
+                          && (nptr[i].cs_flags & CS_CHAT)
+                       ) {
+                               cprintf("%s\n", nptr[i].user.fullname);
+                       }
+               }
+               free(nptr);                                     // free our copy
+       }
+
+       cprintf("000\n");
+}
+
+
+
 /*
  * Participate in real time chat in a room
  */
@@ -223,6 +253,9 @@ void cmd_rcht(char *argbuf)
        else if (!strcasecmp(subcmd, "poll")) {
                roomchat_poll(argbuf);
        }
+       else if (!strcasecmp(subcmd, "rwho")) {
+               roomchat_rwho(argbuf);
+       }
        else {
                cprintf("%d Invalid subcommand\n", ERROR + CMD_NOT_SUPPORTED);
        }
@@ -238,6 +271,6 @@ CTDL_MODULE_INIT(roomchat)
                CtdlRegisterSessionHook(roomchat_shutdown, EVT_SHUTDOWN);
        }
        
-       /* return our Subversion id for the Log */
-       return "$Id$";
+       /* return our module name for the log */
+       return "roomchat";
 }