]> code.citadel.org Git - citadel.git/blobdiff - citadel/room_ops.c
* The size constant "256" which shows up everywhere as a buffer size has now
[citadel.git] / citadel / room_ops.c
index 9dd7ed0ed51b9e4bccb42ad1df99be730e3da38b..e8e0df69b3270ea98133ee93805895b35bf477fe 100644 (file)
@@ -1,13 +1,15 @@
-/* $Id$ */
+/* 
+ * $Id$
+ * 
+ * Server functions which perform operations on room objects.
+ *
+ */
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include <time.h>
 #include <limits.h>
 #include <errno.h>
@@ -20,7 +22,6 @@
 #include "support.h"
 #include "user_ops.h"
 #include "msgbase.h"
-#include "serv_chat.h"
 #include "citserver.h"
 #include "control.h"
 #include "tools.h"
@@ -98,12 +99,18 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
        if (vbuf.v_flags & V_LOCKOUT) {
                retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
        }
+
        /* Aides get access to everything */
        if (userbuf->axlevel >= 6) {
-               retval = retval | UA_KNOWN | UA_GOTOALLOWED;
-               retval = retval & ~UA_ZAPPED;
+               if (vbuf.v_flags & V_FORGET) {
+                       retval = retval | UA_GOTOALLOWED;
+               }
+               else {
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+               }
        }
-      NEWMSG:                  /* By the way, we also check for the presence of new messages */
+
+NEWMSG:        /* By the way, we also check for the presence of new messages */
        if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
                retval = retval | UA_HASNEWMSGS;
        }
@@ -174,8 +181,10 @@ int getroom(struct quickroom *qrbuf, char *room_name)
  */
 int lgetroom(struct quickroom *qrbuf, char *room_name)
 {
-       begin_critical_section(S_QUICKROOM);
-       return (getroom(qrbuf, room_name));
+       register int retval;
+       retval = getroom(qrbuf, room_name);
+       if (retval == 0) begin_critical_section(S_QUICKROOM);
+       return(retval);
 }
 
 
@@ -294,7 +303,8 @@ void lputfloor(struct floor *flbuf, int floor_num)
 /* 
  *  Traverse the room file...
  */
-void ForEachRoom(void (*CallBack) (struct quickroom * EachRoom))
+void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
+               void *in_data)
 {
        struct quickroom qrbuf;
        struct cdbdata *cdbqr;
@@ -309,22 +319,28 @@ void ForEachRoom(void (*CallBack) (struct quickroom * EachRoom))
                cdb_free(cdbqr);
                room_sanity_check(&qrbuf);
                if (qrbuf.QRflags & QR_INUSE)
-                       (*CallBack) (&qrbuf);
+                       (*CallBack)(&qrbuf, in_data);
        }
 }
 
 
 /*
  * delete_msglist()  -  delete room message pointers
- * FIX - this really should check first to make sure there's actually a
- *       msglist to delete.  As things stand now, calling this function on
- *       a room which has never been posted in will result in a message
- *       like "gdbm: illegal data" (no big deal, but could use fixing).
  */
 void delete_msglist(struct quickroom *whichroom)
 {
+        struct cdbdata *cdbml;
 
-       cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+       /* Make sure the msglist we're deleting actually exists, otherwise
+        * gdbm will complain when we try to delete an invalid record
+        */
+        cdbml = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+        if (cdbml != NULL) {
+               cdb_free(cdbml);
+
+               /* Go ahead and delete it */
+               cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+       }
 }
 
 
@@ -420,32 +436,33 @@ void list_roomname(struct quickroom *qrbuf)
 /* 
  * cmd_lrms()   -  List all accessible rooms, known or forgotten
  */
-void cmd_lrms_backend(struct quickroom *qrbuf)
+void cmd_lrms_backend(struct quickroom *qrbuf, void *data)
 {
+       int FloorBeingSearched = (-1);
+       FloorBeingSearched = *(int *)data;
+
        if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
              & (UA_KNOWN | UA_ZAPPED)))
-           && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
-               || ((CC->FloorBeingSearched) < 0)))
+           && ((qrbuf->QRfloor == (FloorBeingSearched))
+               || ((FloorBeingSearched) < 0)))
                list_roomname(qrbuf);
 }
 
 void cmd_lrms(char *argbuf)
 {
-       CC->FloorBeingSearched = (-1);
+       int FloorBeingSearched = (-1);
        if (strlen(argbuf) > 0)
-               CC->FloorBeingSearched = extract_int(argbuf, 0);
+               FloorBeingSearched = extract_int(argbuf, 0);
+
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
        cprintf("%d Accessible rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lrms_backend);
+       ForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -454,32 +471,33 @@ void cmd_lrms(char *argbuf)
 /* 
  * cmd_lkra()   -  List all known rooms
  */
-void cmd_lkra_backend(struct quickroom *qrbuf)
+void cmd_lkra_backend(struct quickroom *qrbuf, void *data)
 {
+       int FloorBeingSearched = (-1);
+       FloorBeingSearched = *(int *)data;
+
        if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
              & (UA_KNOWN)))
-           && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
-               || ((CC->FloorBeingSearched) < 0)))
+           && ((qrbuf->QRfloor == (FloorBeingSearched))
+               || ((FloorBeingSearched) < 0)))
                list_roomname(qrbuf);
 }
 
 void cmd_lkra(char *argbuf)
 {
-       CC->FloorBeingSearched = (-1);
+       int FloorBeingSearched = (-1);
        if (strlen(argbuf) > 0)
-               CC->FloorBeingSearched = extract_int(argbuf, 0);
+               FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
        cprintf("%d Known rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkra_backend);
+       ForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -488,35 +506,35 @@ void cmd_lkra(char *argbuf)
 /* 
  * cmd_lkrn()   -  List all known rooms with new messages
  */
-void cmd_lkrn_backend(struct quickroom *qrbuf)
+void cmd_lkrn_backend(struct quickroom *qrbuf, void *data)
 {
        int ra;
+       int FloorBeingSearched = (-1);
+       FloorBeingSearched = *(int *)data;
 
        ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
        if ((ra & UA_KNOWN)
            && (ra & UA_HASNEWMSGS)
-           && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
-               || ((CC->FloorBeingSearched) < 0)))
+           && ((qrbuf->QRfloor == (FloorBeingSearched))
+               || ((FloorBeingSearched) < 0)))
                list_roomname(qrbuf);
 }
 
 void cmd_lkrn(char *argbuf)
 {
-       CC->FloorBeingSearched = (-1);
+       int FloorBeingSearched = (-1);
        if (strlen(argbuf) > 0)
-               CC->FloorBeingSearched = extract_int(argbuf, 0);
+               FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
        cprintf("%d Rooms w/ new msgs:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkrn_backend);
+       ForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -525,35 +543,35 @@ void cmd_lkrn(char *argbuf)
 /* 
  * cmd_lkro()   -  List all known rooms
  */
-void cmd_lkro_backend(struct quickroom *qrbuf)
+void cmd_lkro_backend(struct quickroom *qrbuf, void *data)
 {
        int ra;
+       int FloorBeingSearched = (-1);
+       FloorBeingSearched = *(int *)data;
 
        ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
        if ((ra & UA_KNOWN)
            && ((ra & UA_HASNEWMSGS) == 0)
-           && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
-               || ((CC->FloorBeingSearched) < 0)))
+           && ((qrbuf->QRfloor == (FloorBeingSearched))
+               || ((FloorBeingSearched) < 0)))
                list_roomname(qrbuf);
 }
 
 void cmd_lkro(char *argbuf)
 {
-       CC->FloorBeingSearched = (-1);
+       int FloorBeingSearched = (-1);
        if (strlen(argbuf) > 0)
-               CC->FloorBeingSearched = extract_int(argbuf, 0);
+               FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
        cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkro_backend);
+       ForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -562,41 +580,41 @@ void cmd_lkro(char *argbuf)
 /* 
  * cmd_lzrm()   -  List all forgotten rooms
  */
-void cmd_lzrm_backend(struct quickroom *qrbuf)
+void cmd_lzrm_backend(struct quickroom *qrbuf, void *data)
 {
        int ra;
+       int FloorBeingSearched = (-1);
+       FloorBeingSearched = *(int *)data;
 
        ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
        if ((ra & UA_GOTOALLOWED)
            && (ra & UA_ZAPPED)
-           && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
-               || ((CC->FloorBeingSearched) < 0)))
+           && ((qrbuf->QRfloor == (FloorBeingSearched))
+               || ((FloorBeingSearched) < 0)))
                list_roomname(qrbuf);
 }
 
 void cmd_lzrm(char *argbuf)
 {
-       CC->FloorBeingSearched = (-1);
+       int FloorBeingSearched = (-1);
        if (strlen(argbuf) > 0)
-               CC->FloorBeingSearched = extract_int(argbuf, 0);
+               FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
        cprintf("%d Zapped rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lzrm_backend);
+       ForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
 
 
-void usergoto(char *where, int display_result)
+void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
 {
        int a;
        int new_messages = 0;
@@ -668,9 +686,14 @@ void usergoto(char *where, int display_result)
                strcpy(truncated_roomname, &truncated_roomname[11]);
        }
 
+       if (retmsgs != NULL) *retmsgs = total_messages;
+       if (retnew != NULL) *retnew = new_messages;
+       lprintf(9, "<%s> %d new of %d total messages\n",
+               CC->quickroom.QRname, new_messages, total_messages);
+
        if (display_result)
                cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
-                       OK, check_express(),
+                       OK, CtdlCheckExpress(),
                        truncated_roomname,
                        new_messages, total_messages,
                        info, CC->quickroom.QRflags,
@@ -691,14 +714,11 @@ void cmd_goto(char *gargs)
        int c;
        int ok = 0;
        int ra;
-       char augmented_roomname[256];
-       char towhere[256];
-       char password[256];
+       char augmented_roomname[SIZ];
+       char towhere[SIZ];
+       char password[SIZ];
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        extract(towhere, gargs, 0);
        extract(password, gargs, 1);
@@ -731,7 +751,7 @@ void cmd_goto(char *gargs)
 
                /* let internal programs go directly to any room */
                if (CC->internal_pgm) {
-                       usergoto(towhere, 1);
+                       usergoto(towhere, 1, NULL, NULL);
                        return;
                }
 
@@ -756,7 +776,7 @@ void cmd_goto(char *gargs)
                                   ((ra & UA_KNOWN) == 0)) {
                                goto NOPE;
                        } else {
-                               usergoto(towhere, 1);
+                               usergoto(towhere, 1, NULL, NULL);
                                return;
                        }
                }
@@ -771,17 +791,9 @@ void cmd_whok(void)
        struct usersupp temp;
        struct cdbdata *cdbus;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
        getuser(&CC->usersupp, CC->curr_user);
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
        cdb_rewind(CDB_USERSUPP);
        while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
@@ -803,16 +815,14 @@ void cmd_whok(void)
  */
 void cmd_rdir(void)
 {
-       char buf[256];
-       char flnm[256];
-       char comment[256];
+       char buf[SIZ];
+       char flnm[SIZ];
+       char comment[SIZ];
        FILE *ls, *fd;
        struct stat statbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        getroom(&CC->quickroom, CC->quickroom.QRname);
        getuser(&CC->usersupp, CC->curr_user);
 
@@ -839,7 +849,7 @@ void cmd_rdir(void)
                fd = fopen("/dev/null", "r");
 
        ls = fopen(CC->temp, "r");
-       while (fgets(flnm, 256, ls) != NULL) {
+       while (fgets(flnm, sizeof flnm, ls) != NULL) {
                flnm[strlen(flnm) - 1] = 0;
                if (strcasecmp(flnm, "filedir")) {
                        sprintf(buf, "%s/files/%s/%s",
@@ -847,7 +857,7 @@ void cmd_rdir(void)
                        stat(buf, &statbuf);
                        strcpy(comment, "");
                        fseek(fd, 0L, 0);
-                       while ((fgets(buf, 256, fd) != NULL)
+                       while ((fgets(buf, sizeof buf, fd) != NULL)
                               && (strlen(comment) == 0)) {
                                buf[strlen(buf) - 1] = 0;
                                if ((!strncasecmp(buf, flnm, strlen(flnm)))
@@ -871,22 +881,18 @@ void cmd_rdir(void)
  */
 void cmd_getr(void)
 {
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
+       /********
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
        }
+       ************/
+
        getroom(&CC->quickroom, CC->quickroom.QRname);
        cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
-               OK, check_express(),
+               OK, CtdlCheckExpress(),
                CC->quickroom.QRname,
                ((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
                ((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
@@ -901,25 +907,26 @@ void cmd_getr(void)
  */
 void cmd_setr(char *args)
 {
-       char buf[256];
+       char buf[SIZ];
        struct floor flbuf;
        char old_name[ROOMNAMELEN];
        int old_floor;
        int new_order = 0;
+       int ne = 0;
+
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        if (is_noneditable(&CC->quickroom)) {
+               ne = 1;
+       }
+
+       /***
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
        }
+       ***/
+
+
        if (num_parms(args) >= 6) {
                getfloor(&flbuf, extract_int(args, 5));
                if ((flbuf.f_flags & F_INUSE) == 0) {
@@ -936,10 +943,16 @@ void cmd_setr(char *args)
                        new_order = 127;
        }
        lgetroom(&CC->quickroom, CC->quickroom.QRname);
+
+       /* Non-editable base rooms can't be renamed */
        strcpy(old_name, CC->quickroom.QRname);
-       extract(buf, args, 0);
-       buf[ROOMNAMELEN] = 0;
-       safestrncpy(CC->quickroom.QRname, buf, sizeof CC->quickroom.QRname);
+       if (!ne) {
+               extract(buf, args, 0);
+               buf[ROOMNAMELEN] = 0;
+               safestrncpy(CC->quickroom.QRname, buf,
+                       sizeof CC->quickroom.QRname);
+       }
+
        extract(buf, args, 1);
        buf[10] = 0;
        safestrncpy(CC->quickroom.QRpasswd, buf, sizeof CC->quickroom.QRpasswd);
@@ -1007,10 +1020,8 @@ void cmd_geta(void)
 {
        struct usersupp usbuf;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
@@ -1030,18 +1041,11 @@ void cmd_seta(char *new_ra)
 {
        struct usersupp usbuf;
        long newu;
-       char buf[256];
+       char buf[SIZ];
        int post_notice;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (getuser(&usbuf, new_ra) != 0) {
                newu = (-1L);
        } else {
@@ -1082,7 +1086,7 @@ void assoc_file_name(char *buf, struct quickroom *qrbuf, char *prefix)
 void cmd_rinf(void)
 {
        char filename[128];
-       char buf[256];
+       char buf[SIZ];
        FILE *info_fp;
 
        assoc_file_name(filename, &CC->quickroom, "info");
@@ -1093,7 +1097,7 @@ void cmd_rinf(void)
                return;
        }
        cprintf("%d Info:\n", LISTING_FOLLOWS);
-       while (fgets(buf, 256, info_fp) != NULL) {
+       while (fgets(buf, sizeof buf, info_fp) != NULL) {
                if (strlen(buf) > 0)
                        buf[strlen(buf) - 1] = 0;
                cprintf("%s\n", buf);
@@ -1120,10 +1124,14 @@ void delete_room(struct quickroom *qrbuf)
        assoc_file_name(filename, qrbuf, "images");
        unlink(filename);
 
+       /* Delete the room's network config file */
+       assoc_file_name(filename, qrbuf, "netconfigs");
+       unlink(filename);
+
        /* Delete the messages in the room
         * (Careful: this opens an S_QUICKROOM critical section!)
         */
-       CtdlDeleteMessages(qrbuf->QRname, 0L, NULL);
+       CtdlDeleteMessages(qrbuf->QRname, 0L, "");
 
        /* Flag the room record as not in use */
        lgetroom(qrbuf, qrbuf->QRname);
@@ -1151,15 +1159,8 @@ void cmd_kill(char *argbuf)
 
        kill_ok = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
@@ -1167,7 +1168,7 @@ void cmd_kill(char *argbuf)
        if (kill_ok) {
                strcpy(deleted_room_name, CC->quickroom.QRname);
                delete_room(&CC->quickroom);    /* Do the dirty work */
-               usergoto(BASEROOM, 0);  /* Return to the Lobby */
+               usergoto(BASEROOM, 0, NULL, NULL); /* Return to the Lobby */
 
                /* tell the world what we did */
                sprintf(aaa, "%s> killed by %s\n",
@@ -1195,8 +1196,11 @@ unsigned create_room(char *new_room_name,
        struct floor flbuf;
        struct visit vbuf;
 
-       if (getroom(&qrbuf, new_room_name) == 0)
+       lprintf(9, "create_room(%s)\n", new_room_name);
+       if (getroom(&qrbuf, new_room_name) == 0) {
+               lprintf(9, "%s already exists.\n", new_room_name);
                return (0);     /* already exists */
+       }
 
        memset(&qrbuf, 0, sizeof(struct quickroom));
        safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
@@ -1253,11 +1257,11 @@ unsigned create_room(char *new_room_name,
 void cmd_cre8(char *args)
 {
        int cre8_ok;
-       char new_room_name[256];
+       char new_room_name[SIZ];
        int new_room_type;
-       char new_room_pass[256];
+       char new_room_pass[SIZ];
        int new_room_floor;
-       char aaa[256];
+       char aaa[SIZ];
        unsigned newflags;
        struct quickroom qrbuf;
        struct floor flbuf;
@@ -1292,10 +1296,7 @@ void cmd_cre8(char *args)
                }
        }
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        if (CC->usersupp.axlevel < config.c_createax) {
                cprintf("%d You need higher access to create rooms.\n",
@@ -1362,18 +1363,11 @@ void cmd_cre8(char *args)
 void cmd_einf(char *ok)
 {                              /* enter info file for current room */
        FILE *fp;
-       char infofilename[256];
-       char buf[256];
+       char infofilename[SIZ];
+       char buf[SIZ];
+
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        if (atoi(ok) == 0) {
                cprintf("%d Ok.\n", OK);
                return;
@@ -1411,15 +1405,7 @@ void cmd_lflr(void)
        int a;
        struct floor flbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       /* if (getuser(&CC->usersupp,CC->curr_user)) {
-          cprintf("%d Can't locate user!\n",ERROR+INTERNAL_ERROR);
-          return;
-          }
-        */
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        cprintf("%d Known floors:\n", LISTING_FOLLOWS);
 
@@ -1442,7 +1428,7 @@ void cmd_lflr(void)
  */
 void cmd_cflr(char *argbuf)
 {
-       char new_floor_name[256];
+       char new_floor_name[SIZ];
        struct floor flbuf;
        int cflr_ok;
        int free_slot = (-1);
@@ -1452,15 +1438,8 @@ void cmd_cflr(char *argbuf)
        cflr_ok = extract_int(argbuf, 1);
 
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to create rooms.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_aide)) return;
+
        for (a = 0; a < MAXFLOORS; ++a) {
                getfloor(&flbuf, a);
 
@@ -1511,16 +1490,8 @@ void cmd_kflr(char *argbuf)
        floor_to_delete = extract_int(argbuf, 0);
        kflr_ok = extract_int(argbuf, 1);
 
+       if (CtdlAccessCheck(ac_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to delete floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        lgetfloor(&flbuf, floor_to_delete);
 
        delete_ok = 1;
@@ -1564,15 +1535,9 @@ void cmd_eflr(char *argbuf)
                cprintf("%d Usage error.\n", ERROR);
                return;
        }
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to edit floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+
+       if (CtdlAccessCheck(ac_aide)) return;
+
        floor_num = extract_int(argbuf, 0);
        lgetfloor(&flbuf, floor_num);
        if ((flbuf.f_flags & F_INUSE) == 0) {