* Extend GETR/SETR to allow twiddling of bits in the QRflags2 bucket

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index e4efd211f8f289d671411b80c5e182591083fd69..eb80025e8cea9a7a599f6c2c7235b1e1f3d67f5d 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -497,10 +497,12 @@ void list_roomname(struct quickroom *qrbuf)
        }
 
        /* ...and now the other parameters */
-       cprintf("|%u|%d|%d\n",
+       cprintf("|%u|%d|%d|%d\n",
                qrbuf->QRflags,
                (int) qrbuf->QRfloor,
-               (int) qrbuf->QRorder);
+               (int) qrbuf->QRorder,
+               (int) qrbuf->QRflags2
+       );
 }
 
 
@@ -1005,7 +1007,7 @@ void cmd_getr(void)
        if (CtdlAccessCheck(ac_room_aide)) return;
 
        getroom(&CC->quickroom, CC->quickroom.QRname);
-       cprintf("%d%c%s|%s|%s|%d|%d|%d|%d\n",
+       cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
                CIT_OK,
                CtdlCheckExpress(),
 
@@ -1022,7 +1024,9 @@ void cmd_getr(void)
                (int) CC->quickroom.QRfloor,
                (int) CC->quickroom.QRorder,
 
-               CC->quickroom.QRdefaultview);
+               CC->quickroom.QRdefaultview,
+               CC->quickroom.QRflags2
+               );
 }
 
 
@@ -1222,6 +1226,11 @@ void cmd_setr(char *args)
                CC->quickroom.QRdefaultview = extract_int(args, 7);
        }
 
+       /* Second set of flags */
+       if (num_parms(args) >= 9) {
+               CC->quickroom.QRflags2 = extract_int(args, 8);
+       }
+
        /* Misc. flags */
        CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE);
        /* Clean up a client boo-boo: if the client set the room to