Create some directories to hold the source files for the utility

[citadel.git] / citadel / rooms.c

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 29e5dbe96f13fff03ef1f01201e3e30be538338c..5fbc76c7f78c210fd8b7657d2c26fd8eddf2aa9a 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -534,7 +534,7 @@ void editthisroom(CtdlIPC *ipc)
        attr->QRflags = set_room_attr(ipc, attr->QRflags, "Private room", QR_PRIVATE);
        if (attr->QRflags & QR_PRIVATE) {
                attr->QRflags = set_room_attr(ipc, attr->QRflags,
-                                      "Accessible by guessing room name",
+                                      "Hidden room (accessible to anyone who knows the room name)",
                                       QR_GUESSNAME);
        }
 
@@ -625,11 +625,6 @@ void editthisroom(CtdlIPC *ipc)
                }
        } while (r / 100 != 2);
 
-       /* FIXME: Duplicate code??? */
-       if (!strcasecmp(raide, "none")) {
-               strcpy(raide, "");
-       }
-
        /* Angels and demons dancing in my head... */
        do {
                snprintf(buf, sizeof buf, "%d", attr->QRep.expire_mode);
@@ -850,6 +845,7 @@ void download(CtdlIPC *ipc, int proto)
        FILE *tpipe = NULL;
        int broken = 0;
        int r;
+       int rv = 0;
        void *file = NULL;      /* The downloaded file */
        size_t filelen = 0L;    /* The downloaded file length */
 
@@ -910,7 +906,7 @@ void download(CtdlIPC *ipc, int proto)
 
        screen_reset();
        stty_ctdl(SB_RESTORE);
-       system(transmit_cmd);
+       rv = system(transmit_cmd);
        stty_ctdl(SB_NO_INTR);
        screen_set();
 
@@ -1075,10 +1071,14 @@ void entroom(CtdlIPC *ipc)
 
        IFNEXPERT formout(ipc, "roomaccess");
        do {
-               scr_printf("<?>Help\n<1>Public room\n<2>Guess-name room\n"
-                      "<3>Passworded room\n<4>Invitation-only room\n"
-                      "<5>Personal room\n"
-                       "Enter room type: ");
+               scr_printf("<?>Help\n"
+                       "<1>Public room (shown to all users by default)\n"
+                       "<2>Hidden room (accessible to anyone who knows the room name)\n"
+                       "<3>Passworded room (hidden, plus requires a password to enter)\n"
+                       "<4>Invitation-only room (requires access to be granted by an Aide)\n"
+                       "<5>Personal room (accessible to you only)\n"
+                       "Enter room type: "
+               );
                do {
                        b = inkey();
                } while (((b < '1') || (b > '5')) && (b != '?'));
@@ -1103,7 +1103,7 @@ void entroom(CtdlIPC *ipc)
        if (b == 1)
                scr_printf(" public room.");
        if (b == 2)
-               scr_printf(" guess-name room.");
+               scr_printf(" hidden room.");
        if (b == 3)
                scr_printf(" passworded room, password: %s", new_room_pass);
        if (b == 4)