Added an elastic string buffer class to libcitadel. Why do I have a feeling I'm...
[citadel.git] / citadel / room_ops.c
index 8174dc97833b485950a786a05e1fbf3d99ed2b34..44573dae34d985470c823f491b9005dba760efb8 100644 (file)
 /* 
- * $Id$
- * 
  * Server functions which perform operations on room objects.
  *
+ * Copyright (c) 1987-2021 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"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <string.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "database.h"
-#include "config.h"
-#include "room_ops.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "user_ops.h"
-#include "msgbase.h"
+#include <libcitadel.h>
+
 #include "citserver.h"
+#include "ctdl_module.h"
+#include "config.h"
 #include "control.h"
-#include "tools.h"
-#include "citadel_dirs.h"
+#include "user_ops.h"
+#include "room_ops.h"
 
 struct floor *floorcache[MAXFLOORS];
 
+/* 
+ * Determine whether the currently logged in session has permission to read
+ * messages in the current room.
+ */
+int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) {
+       if (    (!(CC->logged_in))
+               && (!(CC->internal_pgm))
+               && (!CtdlGetConfigInt("c_guest_logins"))
+       ) {
+               return(om_not_logged_in);
+       }
+       return(om_ok);
+}
+
+
 /*
- * Generic routine for determining user access to rooms
+ * Check to see whether we have permission to post a message in the current
+ * room.  Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or
+ * returns 0 on success.
  */
-void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
-               int *result, int *view)
-{
+int CtdlDoIHavePermissionToPostInThisRoom(
+       char *errmsgbuf, 
+       size_t n, 
+       const char* RemoteIdentifier,
+       PostType PostPublic,
+       int is_reply
+) {
+       int ra;
+
+       if (!(CC->logged_in) && (PostPublic == POST_LOGGED_IN)) {
+               snprintf(errmsgbuf, n, "Not logged in.");
+               return (ERROR + NOT_LOGGED_IN);
+       }
+       else if (PostPublic == CHECK_EXISTANCE) {
+               return (0);                                     // evaluate whether a recipient exists
+       }
+       else if (!(CC->logged_in)) {
+               if ((CC->room.QRflags & QR_READONLY)) {
+                       snprintf(errmsgbuf, n, "Not logged in.");
+                       return (ERROR + NOT_LOGGED_IN);
+               }
+               if (CC->room.QRflags2 & QR2_MODERATED) {
+                       snprintf(errmsgbuf, n, "Not logged in Moderation feature not yet implemented!");
+                       return (ERROR + NOT_LOGGED_IN);
+               }
+               // FIXME what was this?  AJC 2021
+               //if ((PostPublic != POST_LMTP) && (CC->room.QRflags2 & QR2_SMTP_PUBLIC) == 0) {
+                       //return CtdlNetconfigCheckRoomaccess(errmsgbuf, n, RemoteIdentifier);
+               //}
+               return (0);
+       }
+
+       if ((CC->user.axlevel < AxProbU) && ((CC->room.QRflags & QR_MAILBOX) == 0)) {
+               snprintf(errmsgbuf, n, "Need to be validated to enter (except in %s> to sysop)", MAILROOM);
+               return (ERROR + HIGHER_ACCESS_REQUIRED);
+       }
+
+       CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL);
+
+       if (ra & UA_POSTALLOWED) {
+               strcpy(errmsgbuf, "OK to post or reply here");
+               return(0);
+       }
+
+       if ( (ra & UA_REPLYALLOWED) && (is_reply) ) {
+               /*
+                * To be thorough, we ought to check to see if the message they are
+                * replying to is actually a valid one in this room, but unless this
+                * actually becomes a problem we'll go with high performance instead.
+                */
+               strcpy(errmsgbuf, "OK to reply here");
+               return(0);
+       }
+
+       if ( (ra & UA_REPLYALLOWED) && (!is_reply) ) {
+               /* Clarify what happened with a better error message */
+               snprintf(errmsgbuf, n, "You may only reply to existing messages here.");
+               return (ERROR + HIGHER_ACCESS_REQUIRED);
+       }
+
+       snprintf(errmsgbuf, n, "Higher access is required to post in this room.");
+       return (ERROR + HIGHER_ACCESS_REQUIRED);
+
+}
+
+
+/*
+ * Check whether the current user has permission to delete messages from
+ * the current room (returns 1 for yes, 0 for no)
+ */
+int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) {
+       int ra;
+       CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL);
+       if (ra & UA_DELETEALLOWED) return(1);
+       return(0);
+}
+
+
+/*
+ * Retrieve access control information for any user/room pair.
+ * Yes, it has a couple of gotos.  If you don't like that, go die in a car fire.
+ */
+void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, int *result, int *view) {
        int retval = 0;
-       struct visit vbuf;
+       visit vbuf;
+       int is_me = 0;
+       int is_guest = 0;
+
+       if (userbuf == &CC->user) {
+               is_me = 1;
+       }
+
+       if ((is_me) && (CtdlGetConfigInt("c_guest_logins")) && (!CC->logged_in)) {
+               is_guest = 1;
+       }
 
        /* for internal programs, always do everything */
        if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) {
-               retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED);
+               retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED);
+               vbuf.v_view = 0;
+               goto SKIP_EVERYTHING;
+       }
+
+       /* If guest mode is enabled, always grant access to the Lobby */
+       if ((is_guest) && (!strcasecmp(roombuf->QRname, BASEROOM))) {
+               retval = (UA_KNOWN | UA_GOTOALLOWED);
                vbuf.v_view = 0;
                goto SKIP_EVERYTHING;
        }
 
        /* Locate any applicable user/room relationships */
-       CtdlGetRelationship(&vbuf, userbuf, roombuf);
+       if (is_guest) {
+               memset(&vbuf, 0, sizeof vbuf);
+       }
+       else {
+               CtdlGetRelationship(&vbuf, userbuf, roombuf);
+       }
 
        /* Force the properties of the Aide room */
-       if (!strcasecmp(roombuf->QRname, config.c_aideroom)) {
-               if (userbuf->axlevel >= 6) {
-                       retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
+       if (!strcasecmp(roombuf->QRname, CtdlGetConfigStr("c_aideroom"))) {
+               if (userbuf->axlevel >= AxAideU) {
+                       retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED;
                } else {
                        retval = 0;
                }
@@ -73,21 +173,23 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
        }
 
        /* If this is a public room, it's accessible... */
-       if ( ((roombuf->QRflags & QR_PRIVATE) == 0) 
-          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
+       if (    ((roombuf->QRflags & QR_PRIVATE) == 0) 
+               && ((roombuf->QRflags & QR_MAILBOX) == 0)
+       ) {
                retval = retval | UA_KNOWN | UA_GOTOALLOWED;
        }
 
        /* If this is a preferred users only room, check access level */
        if (roombuf->QRflags & QR_PREFONLY) {
-               if (userbuf->axlevel < 5) {
+               if (userbuf->axlevel < AxPrefU) {
                        retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
                }
        }
 
        /* For private rooms, check the generation number matchups */
-       if ( (roombuf->QRflags & QR_PRIVATE) 
-          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
+       if (    (roombuf->QRflags & QR_PRIVATE) 
+               && ((roombuf->QRflags & QR_MAILBOX) == 0)
+       ) {
 
                /* An explicit match means the user belongs in this room */
                if (vbuf.v_flags & V_ACCESS) {
@@ -96,8 +198,9 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
                /* Otherwise, check if this is a guess-name or passworded
                 * room.  If it is, a goto may at least be attempted
                 */
-               else if ((roombuf->QRflags & QR_PRIVATE)
-                        || (roombuf->QRflags & QR_PASSWORDED)) {
+               else if (       (roombuf->QRflags & QR_PRIVATE)
+                               || (roombuf->QRflags & QR_PASSWORDED)
+               ) {
                        retval = retval & ~UA_KNOWN;
                        retval = retval | UA_GOTOALLOWED;
                }
@@ -105,13 +208,13 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
 
        /* For mailbox rooms, also check the namespace */
        /* Also, mailbox owners can delete their messages */
-       if (roombuf->QRflags & QR_MAILBOX) {
+       if ( (roombuf->QRflags & QR_MAILBOX) && (atol(roombuf->QRname) != 0)) {
                if (userbuf->usernum == atol(roombuf->QRname)) {
-                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED;
                }
                /* An explicit match means the user belongs in this room */
                if (vbuf.v_flags & V_ACCESS) {
-                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED;
                }
        }
 
@@ -122,13 +225,39 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
                 * - User is not validated
                 * - User has no net privileges and it is a shared network room
                 * - It is a read-only room
+                * - It is a blog room (in which case we only allow replies to existing messages)
                 */
                int post_allowed = 1;
-               if (CC->user.axlevel < 2) post_allowed = 0;
-               if ((CC->user.axlevel < 4) && (CC->room.QRflags & QR_NETWORK)) post_allowed = 0;
-               if (roombuf->QRflags & QR_READONLY) post_allowed = 0;
+               int reply_allowed = 1;
+               if (userbuf->axlevel < AxProbU) {
+                       post_allowed = 0;
+                       reply_allowed = 0;
+               }
+               if ((userbuf->axlevel < AxNetU) && (roombuf->QRflags & QR_NETWORK)) {
+                       post_allowed = 0;
+                       reply_allowed = 0;
+               }
+               if (roombuf->QRflags & QR_READONLY) {
+                       post_allowed = 0;
+                       reply_allowed = 0;
+               }
+               if (roombuf->QRdefaultview == VIEW_BLOG) {
+                       post_allowed = 0;
+               }
                if (post_allowed) {
-                       retval = retval | UA_POSTALLOWED;
+                       retval = retval | UA_POSTALLOWED | UA_REPLYALLOWED;
+               }
+               if (reply_allowed) {
+                       retval = retval | UA_REPLYALLOWED;
+               }
+
+               /* If "collaborative deletion" is active for this room, any user who can post
+                * is also allowed to delete
+                */
+               if (roombuf->QRflags2 & QR2_COLLABDEL) {
+                       if (retval & UA_POSTALLOWED) {
+                               retval = retval | UA_DELETEALLOWED;
+                       }
                }
 
        }
@@ -136,42 +265,46 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
        /* Check to see if the user has forgotten this room */
        if (vbuf.v_flags & V_FORGET) {
                retval = retval & ~UA_KNOWN;
-               if ( ( ((roombuf->QRflags & QR_PRIVATE) == 0) 
-                     && ((roombuf->QRflags & QR_MAILBOX) == 0) )
-                  || ( (roombuf->QRflags & QR_MAILBOX) 
-                     && (atol(roombuf->QRname) == CC->user.usernum))) {
+               if (    ( ((roombuf->QRflags & QR_PRIVATE) == 0) 
+                       && ((roombuf->QRflags & QR_MAILBOX) == 0)
+               ) || (  (roombuf->QRflags & QR_MAILBOX) 
+                       && (atol(roombuf->QRname) == CC->user.usernum))
+               ) {
                        retval = retval | UA_ZAPPED;
                }
        }
+
        /* If user is explicitly locked out of this room, deny everything */
        if (vbuf.v_flags & V_LOCKOUT) {
-               retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED & ~UA_POSTALLOWED;
+               retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED & ~UA_POSTALLOWED & ~UA_REPLYALLOWED;
        }
 
        /* Aides get access to all private rooms */
-       if ( (userbuf->axlevel >= 6)
-          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
+       if (    (userbuf->axlevel >= AxAideU)
+               && ((roombuf->QRflags & QR_MAILBOX) == 0)
+       ) {
                if (vbuf.v_flags & V_FORGET) {
-                       retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
+                       retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED | UA_REPLYALLOWED;
                }
                else {
-                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED;
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_REPLYALLOWED;
                }
        }
 
        /* Aides can gain access to mailboxes as well, but they don't show
         * by default.
         */
-       if ( (userbuf->axlevel >= 6)
-          && (roombuf->QRflags & QR_MAILBOX) ) {
-               retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
+       if (    (userbuf->axlevel >= AxAideU)
+               && (roombuf->QRflags & QR_MAILBOX)
+       ) {
+               retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED | UA_REPLYALLOWED;
        }
 
        /* Aides and Room Aides have admin privileges */
-       if ( (userbuf->axlevel >= 6)
-          || (userbuf->usernum == roombuf->QRroomaide)
-          ) {
-               retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED;
+       if (    (userbuf->axlevel >= AxAideU)
+               || (userbuf->usernum == roombuf->QRroomaide)
+       ) {
+               retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED | UA_POSTALLOWED | UA_REPLYALLOWED;
        }
 
 NEWMSG:        /* By the way, we also check for the presence of new messages */
@@ -190,76 +323,74 @@ SKIP_EVERYTHING:
        if (view != NULL) *view = vbuf.v_view;
 }
 
+
 /*
  * Self-checking stuff for a room record read into memory
  */
-void room_sanity_check(struct ctdlroom *qrbuf)
-{
+void room_sanity_check(struct ctdlroom *qrbuf) {
        /* Mailbox rooms are always on the lowest floor */
        if (qrbuf->QRflags & QR_MAILBOX) {
                qrbuf->QRfloor = 0;
        }
        /* Listing order of 0 is illegal except for base rooms */
-       if (qrbuf->QRorder == 0)
-               if (!(qrbuf->QRflags & QR_MAILBOX) &&
-                   strncasecmp(qrbuf->QRname, config.c_baseroom, ROOMNAMELEN)
-                   &&
-                   strncasecmp(qrbuf->QRname, config.c_aideroom, ROOMNAMELEN))
+       if (qrbuf->QRorder == 0) {
+               if (    !(qrbuf->QRflags & QR_MAILBOX)
+                       && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN)
+                       && strncasecmp(qrbuf->QRname, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)
+               ) {
                        qrbuf->QRorder = 64;
+               }
+       }
 }
 
 
 /*
- * getroom()  -  retrieve room data from disk
+ * CtdlGetRoom()  -  retrieve room data from disk
  */
-int getroom(struct ctdlroom *qrbuf, char *room_name)
-{
+int CtdlGetRoom(struct ctdlroom *qrbuf, const char *room_name) {
        struct cdbdata *cdbqr;
        char lowercase_name[ROOMNAMELEN];
        char personal_lowercase_name[ROOMNAMELEN];
-       int a;
+       const char *sptr;
+       char *dptr, *eptr;
 
-       for (a = 0; room_name[a] && a < sizeof lowercase_name - 1; ++a) {
-               lowercase_name[a] = tolower(room_name[a]);
+       dptr = lowercase_name;
+       sptr = room_name;
+       eptr = (dptr + (sizeof lowercase_name - 1));
+       while (!IsEmptyStr(sptr) && (dptr < eptr)) {
+               *dptr = tolower(*sptr);
+               sptr++; dptr++;
        }
-       lowercase_name[a] = 0;
+       *dptr = '\0';
 
        memset(qrbuf, 0, sizeof(struct ctdlroom));
 
        /* First, try the public namespace */
-       cdbqr = cdb_fetch(CDB_ROOMS,
-                         lowercase_name, strlen(lowercase_name));
+       cdbqr = cdb_fetch(CDB_ROOMS, lowercase_name, strlen(lowercase_name));
 
        /* If that didn't work, try the user's personal namespace */
        if (cdbqr == NULL) {
-               snprintf(personal_lowercase_name,
-                        sizeof personal_lowercase_name, "%010ld.%s",
-                        CC->user.usernum, lowercase_name);
-               cdbqr = cdb_fetch(CDB_ROOMS,
-                                 personal_lowercase_name,
-                                 strlen(personal_lowercase_name));
+               snprintf(personal_lowercase_name, sizeof personal_lowercase_name, "%010ld.%s", CC->user.usernum, lowercase_name);
+               cdbqr = cdb_fetch(CDB_ROOMS, personal_lowercase_name, strlen(personal_lowercase_name));
        }
        if (cdbqr != NULL) {
-               memcpy(qrbuf, cdbqr->ptr,
-                      ((cdbqr->len > sizeof(struct ctdlroom)) ?
-                       sizeof(struct ctdlroom) : cdbqr->len));
+               memcpy(qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ?  sizeof(struct ctdlroom) : cdbqr->len));
                cdb_free(cdbqr);
-
                room_sanity_check(qrbuf);
-
                return (0);
-       } else {
+       }
+       else {
                return (1);
        }
 }
 
+
 /*
- * lgetroom()  -  same as getroom() but locks the record (if supported)
+ * CtdlGetRoomLock()  -  same as getroom() but locks the record (if supported)
  */
-int lgetroom(struct ctdlroom *qrbuf, char *room_name)
-{
+int CtdlGetRoomLock(struct ctdlroom *qrbuf, const char *room_name) {
        register int retval;
-       retval = getroom(qrbuf, room_name);
+       retval = CtdlGetRoom(qrbuf, room_name);
        if (retval == 0) begin_critical_section(S_ROOMS);
        return(retval);
 }
@@ -272,28 +403,33 @@ int lgetroom(struct ctdlroom *qrbuf, char *room_name)
 void b_putroom(struct ctdlroom *qrbuf, char *room_name)
 {
        char lowercase_name[ROOMNAMELEN];
-       int a;
+       char *aptr, *bptr;
+       long len;
 
-       for (a = 0; a <= strlen(room_name); ++a) {
-               lowercase_name[a] = tolower(room_name[a]);
+       aptr = room_name;
+       bptr = lowercase_name;
+       while (!IsEmptyStr(aptr)) {
+               *bptr = tolower(*aptr);
+               aptr++;
+               bptr++;
        }
+       *bptr='\0';
 
+       len = bptr - lowercase_name;
        if (qrbuf == NULL) {
-               cdb_delete(CDB_ROOMS,
-                          lowercase_name, strlen(lowercase_name));
-       else {
+               cdb_delete(CDB_ROOMS, lowercase_name, len);
+       }
+       else {
                time(&qrbuf->QRmtime);
-               cdb_store(CDB_ROOMS,
-                         lowercase_name, strlen(lowercase_name),
-                         qrbuf, sizeof(struct ctdlroom));
+               cdb_store(CDB_ROOMS, lowercase_name, len, qrbuf, sizeof(struct ctdlroom));
        }
 }
 
 
 /* 
- * putroom()  -  store room data to disk
+ * CtdlPutRoom()  -  store room data to disk
  */
-void putroom(struct ctdlroom *qrbuf) {
+void CtdlPutRoom(struct ctdlroom *qrbuf) {
        b_putroom(qrbuf, qrbuf->QRname);
 }
 
@@ -306,62 +442,101 @@ void b_deleteroom(char *room_name) {
 }
 
 
+/*
+ * CtdlPutRoomLock()  -  same as CtdlPutRoom() but unlocks the record (if supported)
+ */
+void CtdlPutRoomLock(struct ctdlroom *qrbuf) {
+       CtdlPutRoom(qrbuf);
+       end_critical_section(S_ROOMS);
+}
+
 
 /*
- * lputroom()  -  same as putroom() but unlocks the record (if supported)
+ * CtdlGetFloorByName()  -  retrieve the number of the named floor
+ * return < 0 if not found else return floor number
  */
-void lputroom(struct ctdlroom *qrbuf)
-{
+int CtdlGetFloorByName(const char *floor_name) {
+       int a;
+       struct floor *flbuf = NULL;
 
-       putroom(qrbuf);
-       end_critical_section(S_ROOMS);
+       for (a = 0; a < MAXFLOORS; ++a) {
+               flbuf = CtdlGetCachedFloor(a);
 
+               /* check to see if it already exists */
+               if ((!strcasecmp(flbuf->f_name, floor_name)) && (flbuf->f_flags & F_INUSE)) {
+                       return a;
+               }
+       }
+       return -1;
 }
 
-/****************************************************************************/
 
 /*
- * getfloor()  -  retrieve floor data from disk
+ * CtdlGetFloorByNameLock()  -  retrieve floor number for given floor and lock the floor list.
  */
-void getfloor(struct floor *flbuf, int floor_num)
+int CtdlGetFloorByNameLock(const char *floor_name)
 {
+       begin_critical_section(S_FLOORTAB);
+       return CtdlGetFloorByName(floor_name);
+}
+
+
+/*
+ * CtdlGetAvailableFloor()  -  Return number of first unused floor
+ * return < 0 if none available
+ */
+int CtdlGetAvailableFloor(void) {
+       int a;
+       struct floor *flbuf = NULL;
+
+       for (a = 0; a < MAXFLOORS; a++) {
+               flbuf = CtdlGetCachedFloor(a);
+
+               /* check to see if it already exists */
+               if ((flbuf->f_flags & F_INUSE) == 0) {
+                       return a;
+               }
+       }
+       return -1;
+}
+
+
+/*
+ * CtdlGetFloor()  -  retrieve floor data from disk
+ */
+void CtdlGetFloor(struct floor *flbuf, int floor_num) {
        struct cdbdata *cdbfl;
 
        memset(flbuf, 0, sizeof(struct floor));
        cdbfl = cdb_fetch(CDB_FLOORTAB, &floor_num, sizeof(int));
        if (cdbfl != NULL) {
-               memcpy(flbuf, cdbfl->ptr,
-                      ((cdbfl->len > sizeof(struct floor)) ?
-                       sizeof(struct floor) : cdbfl->len));
+               memcpy(flbuf, cdbfl->ptr, ((cdbfl->len > sizeof(struct floor)) ?  sizeof(struct floor) : cdbfl->len));
                cdb_free(cdbfl);
        } else {
                if (floor_num == 0) {
-                       safestrncpy(flbuf->f_name, "Main Floor", 
-                               sizeof flbuf->f_name);
+                       safestrncpy(flbuf->f_name, "Main Floor", sizeof flbuf->f_name);
                        flbuf->f_flags = F_INUSE;
                        flbuf->f_ref_count = 3;
                }
        }
-
 }
 
+
 /*
- * lgetfloor()  -  same as getfloor() but locks the record (if supported)
+ * lgetfloor()  -  same as CtdlGetFloor() but locks the record (if supported)
  */
-void lgetfloor(struct floor *flbuf, int floor_num)
-{
-
+void lgetfloor(struct floor *flbuf, int floor_num) {
        begin_critical_section(S_FLOORTAB);
-       getfloor(flbuf, floor_num);
+       CtdlGetFloor(flbuf, floor_num);
 }
 
 
 /*
- * cgetfloor()  -  Get floor record from *cache* (loads from disk if needed)
+ * CtdlGetCachedFloor()  -  Get floor record from *cache* (loads from disk if needed)
  *    
  * This is strictly a performance hack.
  */
-struct floor *cgetfloor(int floor_num) {
+struct floor *CtdlGetCachedFloor(int floor_num) {
        static int initialized = 0;
        int i;
        int fetch_new = 0;
@@ -381,7 +556,7 @@ struct floor *cgetfloor(int floor_num) {
 
        if (fetch_new) {
                fl = malloc(sizeof(struct floor));
-               getfloor(fl, floor_num);
+               CtdlGetFloor(fl, floor_num);
                begin_critical_section(S_FLOORCACHE);
                if (floorcache[floor_num] != NULL) {
                        free(floorcache[floor_num]);
@@ -394,12 +569,10 @@ struct floor *cgetfloor(int floor_num) {
 }
 
 
-
 /*
- * putfloor()  -  store floor data on disk
+ * CtdlPutFloor()  -  store floor data on disk
  */
-void putfloor(struct floor *flbuf, int floor_num)
-{
+void CtdlPutFloor(struct floor *flbuf, int floor_num) {
        /* If we've cached this, clear it out, 'cuz it's WRONG now! */
        begin_critical_section(S_FLOORCACHE);
        if (floorcache[floor_num] != NULL) {
@@ -415,37 +588,39 @@ void putfloor(struct floor *flbuf, int floor_num)
 
 
 /*
- * lputfloor()  -  same as putfloor() but unlocks the record (if supported)
+ * CtdlPutFloorLock()  -  same as CtdlPutFloor() but unlocks the record (if supported)
  */
-void lputfloor(struct floor *flbuf, int floor_num)
-{
-
-       putfloor(flbuf, floor_num);
+void CtdlPutFloorLock(struct floor *flbuf, int floor_num) {
+       CtdlPutFloor(flbuf, floor_num);
        end_critical_section(S_FLOORTAB);
 
 }
 
 
+/*
+ * lputfloor()  -  same as CtdlPutFloor() but unlocks the record (if supported)
+ */
+void lputfloor(struct floor *flbuf, int floor_num) {
+       CtdlPutFloorLock(flbuf, floor_num);
+}
+
 /* 
- *  Traverse the room file...
+ * Iterate through the room table, performing a callback for each room.
  */
-void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
-               void *in_data)
-{
+void CtdlForEachRoom(ForEachRoomCallBack callback_func, void *in_data) {
        struct ctdlroom qrbuf;
        struct cdbdata *cdbqr;
 
        cdb_rewind(CDB_ROOMS);
 
        while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) {
-               memset(&qrbuf, 0, sizeof(struct ctdlroom));
-               memcpy(&qrbuf, cdbqr->ptr,
-                      ((cdbqr->len > sizeof(struct ctdlroom)) ?
-                       sizeof(struct ctdlroom) : cdbqr->len));
+               memset(&qrbuf, 0, sizeof(struct ctdlroom));
+               memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ?  sizeof(struct ctdlroom) : cdbqr->len) );
                cdb_free(cdbqr);
                room_sanity_check(&qrbuf);
-               if (qrbuf.QRflags & QR_INUSE)
-                       (*CallBack)(&qrbuf, in_data);
+               if (qrbuf.QRflags & QR_INUSE) {
+                       callback_func(&qrbuf, in_data);
+               }
        }
 }
 
@@ -453,12 +628,11 @@ void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
 /*
  * delete_msglist()  -  delete room message pointers
  */
-void delete_msglist(struct ctdlroom *whichroom)
-{
+void delete_msglist(struct ctdlroom *whichroom) {
         struct cdbdata *cdbml;
 
        /* Make sure the msglist we're deleting actually exists, otherwise
-        * gdbm will complain when we try to delete an invalid record
+        * libdb will complain when we try to delete an invalid record
         */
         cdbml = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
         if (cdbml != NULL) {
@@ -470,39 +644,38 @@ void delete_msglist(struct ctdlroom *whichroom)
 }
 
 
+/*
+ * Message pointer compare function for sort_msglist()
+ */
+int sort_msglist_cmp(const void *m1, const void *m2) {
+       if ((*(const long *)m1) > (*(const long *)m2)) return(1);
+       if ((*(const long *)m1) < (*(const long *)m2)) return(-1);
+       return(0);
+}
 
 
 /*
  * sort message pointers
  * (returns new msg count)
  */
-int sort_msglist(long listptrs[], int oldcount)
-{
-       int a, b;
-       long hold1, hold2;
+int sort_msglist(long listptrs[], int oldcount) {
        int numitems;
+       int i = 0;
 
        numitems = oldcount;
-       if (numitems < 2)
+       if (numitems < 2) {
                return (oldcount);
+       }
 
        /* do the sort */
-       for (a = numitems - 2; a >= 0; --a) {
-               for (b = 0; b <= a; ++b) {
-                       if (listptrs[b] > (listptrs[b + 1])) {
-                               hold1 = listptrs[b];
-                               hold2 = listptrs[b + 1];
-                               listptrs[b] = hold2;
-                               listptrs[b + 1] = hold1;
-                       }
-               }
-       }
+       qsort(listptrs, numitems, sizeof(long), sort_msglist_cmp);
 
        /* and yank any nulls */
-       while ((numitems > 0) && (listptrs[0] == 0L)) {
-               memcpy(&listptrs[0], &listptrs[1],
-                      (sizeof(long) * (numitems - 1)));
-               --numitems;
+       while ((i < numitems) && (listptrs[i] == 0L)) i++;
+
+       if (i > 0) {
+               memmove(&listptrs[0], &listptrs[i], (sizeof(long) * (numitems - i)));
+               numitems-=i;
        }
 
        return (numitems);
@@ -512,13 +685,12 @@ int sort_msglist(long listptrs[], int oldcount)
 /*
  * Determine whether a given room is non-editable.
  */
-int is_noneditable(struct ctdlroom *qrbuf)
-{
+int CtdlIsNonEditable(struct ctdlroom *qrbuf) {
 
        /* Mail> rooms are non-editable */
-       if ( (qrbuf->QRflags & QR_MAILBOX)
-            && (!strcasecmp(&qrbuf->QRname[11], MAILROOM)) )
+       if ( (qrbuf->QRflags & QR_MAILBOX) && (!strcasecmp(&qrbuf->QRname[11], MAILROOM)) ) {
                return (1);
+       }
 
        /* Everything else is editable */
        return (0);
@@ -526,278 +698,25 @@ int is_noneditable(struct ctdlroom *qrbuf)
 
 
 
-/*
- * Back-back-end for all room listing commands
- */
-void list_roomname(struct ctdlroom *qrbuf, int ra, int current_view, int default_view)
-{
-       char truncated_roomname[ROOMNAMELEN];
-
-       /* For my own mailbox rooms, chop off the owner prefix */
-       if ( (qrbuf->QRflags & QR_MAILBOX)
-            && (atol(qrbuf->QRname) == CC->user.usernum) ) {
-               safestrncpy(truncated_roomname, qrbuf->QRname, sizeof truncated_roomname);
-               safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
-               cprintf("%s", truncated_roomname);
-       }
-       /* For all other rooms, just display the name in its entirety */
-       else {
-               cprintf("%s", qrbuf->QRname);
-       }
-
-       /* ...and now the other parameters */
-       cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n",
-               qrbuf->QRflags,
-               (int) qrbuf->QRfloor,
-               (int) qrbuf->QRorder,
-               (int) qrbuf->QRflags2,
-               ra,
-               current_view,
-               default_view,
-               qrbuf->QRmtime
-       );
-}
-
-
-/* 
- * cmd_lrms()   -  List all accessible rooms, known or forgotten
- */
-void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if ((( ra & (UA_KNOWN | UA_ZAPPED)))
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lrms(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       if (getuser(&CC->user, 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, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
-
-/* 
- * cmd_lkra()   -  List all known rooms
- */
-void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if ((( ra & (UA_KNOWN)))
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lkra(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-       
-       if (getuser(&CC->user, 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, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
-
-void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if (   ((qrbuf->QRflags & QR_PRIVATE) == 0)
-               && ((qrbuf->QRflags & QR_MAILBOX) == 0)
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lprm(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
-
-       ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
-
-/* 
- * cmd_lkrn()   -  List all known rooms with new messages
- */
-void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if ((ra & UA_KNOWN)
-           && (ra & UA_HASNEWMSGS)
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lkrn(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-       
-       if (getuser(&CC->user, 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, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
-
-/* 
- * cmd_lkro()   -  List all known rooms
- */
-void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if ((ra & UA_KNOWN)
-           && ((ra & UA_HASNEWMSGS) == 0)
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lkro(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-       
-       if (getuser(&CC->user, 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, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
-
-/* 
- * cmd_lzrm()   -  List all forgotten rooms
- */
-void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data)
-{
-       int FloorBeingSearched = (-1);
-       int ra;
-       int view;
-
-       FloorBeingSearched = *(int *)data;
-       CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
-
-       if ((ra & UA_GOTOALLOWED)
-           && (ra & UA_ZAPPED)
-           && ((qrbuf->QRfloor == (FloorBeingSearched))
-               || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
-}
-
-void cmd_lzrm(char *argbuf)
-{
-       int FloorBeingSearched = (-1);
-       if (strlen(argbuf) > 0)
-               FloorBeingSearched = extract_int(argbuf, 0);
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-       
-       if (getuser(&CC->user, 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, &FloorBeingSearched);
-       cprintf("000\n");
-}
-
-
 /*
  * Make the specified room the current room for this session.  No validation
  * or access control is done here -- the caller should make sure that the
  * specified room exists and is ok to access.
  */
-void usergoto(char *where, int display_result, int transiently,
-               int *retmsgs, int *retnew)
+void CtdlUserGoto(char *where, int display_result, int transiently,
+               int *retmsgs, int *retnew, long *retoldest, long *retnewest)
 {
        int a;
        int new_messages = 0;
        int old_messages = 0;
        int total_messages = 0;
+       long oldest_message = 0;
+       long newest_message = 0;
        int info = 0;
        int rmailflag;
        int raideflag;
        int newmailcount = 0;
-       struct visit vbuf;
+       visit vbuf;
        char truncated_roomname[ROOMNAMELEN];
         struct cdbdata *cdbfr;
        long *msglist = NULL;
@@ -815,7 +734,7 @@ void usergoto(char *where, int display_result, int transiently,
         */
        if (where != NULL) {
                safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname);
-               getroom(&CC->room, where);
+               CtdlGetRoom(&CC->room, where);
        }
 
        /* Take care of all the formalities. */
@@ -827,8 +746,15 @@ void usergoto(char *where, int display_result, int transiently,
        /* Know the room ... but not if it's the page log room, or if the
         * caller specified that we're only entering this room transiently.
         */
-       if ((strcasecmp(CC->room.QRname, config.c_logpages))
-          && (transiently == 0) ) {
+       int add_room_to_known_list = 1;
+       if (transiently == 1) {
+               add_room_to_known_list = 0;
+       }
+       char *c_logpages = CtdlGetConfigStr("c_logpages");
+       if ( (c_logpages != NULL) && (!strcasecmp(CC->room.QRname, c_logpages)) ) {
+               add_room_to_known_list = 0;
+       }
+       if (add_room_to_known_list) {
                vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
        }
@@ -842,15 +768,17 @@ void usergoto(char *where, int display_result, int transiently,
        /* Check for new mail */
        newmailcount = NewMailCount();
 
-       /* set info to 1 if the user needs to read the room's info file */
-       if (CC->room.QRinfo > vbuf.v_lastseen) {
+       /* Set info to 1 if the room banner is new since our last visit.
+        * Some clients only want to display it when it changes.
+        */
+       if (CC->room.msgnum_info > vbuf.v_lastseen) {
                info = 1;
        }
 
         cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
         if (cdbfr != NULL) {
                msglist = (long *) cdbfr->ptr;
-               cdbfr->ptr = NULL;      /* usergoto() now owns this memory */
+               cdbfr->ptr = NULL;      /* CtdlUserGoto() now owns this memory */
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
        }
@@ -859,7 +787,12 @@ void usergoto(char *where, int display_result, int transiently,
        for (a=0; a<num_msgs; ++a) {
                if (msglist[a] > 0L) ++total_messages;
        }
-       new_messages = num_msgs;
+
+       if (total_messages > 0) {
+               oldest_message = msglist[0];
+               newest_message = msglist[num_msgs - 1];
+       }
+
        num_sets = num_tokens(vbuf.v_seen, ',');
        for (s=0; s<num_sets; ++s) {
                extract_token(setstr, vbuf.v_seen, s, ',', sizeof setstr);
@@ -893,15 +826,13 @@ void usergoto(char *where, int display_result, int transiently,
        else
                rmailflag = 0;
 
-       if ((CC->room.QRroomaide == CC->user.usernum)
-           || (CC->user.axlevel >= 6))
+       if ((CC->room.QRroomaide == CC->user.usernum) || (CC->user.axlevel >= AxAideU))
                raideflag = 1;
        else
                raideflag = 0;
 
        safestrncpy(truncated_roomname, CC->room.QRname, sizeof truncated_roomname);
-       if ( (CC->room.QRflags & QR_MAILBOX)
-          && (atol(CC->room.QRname) == CC->user.usernum) ) {
+       if ( (CC->room.QRflags & QR_MAILBOX) && (atol(CC->room.QRname) == CC->user.usernum) ) {
                safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
        }
 
@@ -911,15 +842,16 @@ void usergoto(char *where, int display_result, int transiently,
 
        if (retmsgs != NULL) *retmsgs = total_messages;
        if (retnew != NULL) *retnew = new_messages;
-       lprintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
-               CC->room.QRname,
-               new_messages, total_messages
+       if (retoldest != NULL) *retoldest = oldest_message;
+       if (retnewest != NULL) *retnewest = newest_message;
+       syslog(LOG_DEBUG, "room_ops: %s : %d new of %d total messages, oldest=%ld, newest=%ld",
+                  CC->room.QRname, new_messages, total_messages, oldest_message, newest_message
        );
 
        CC->curr_view = (int)vbuf.v_view;
 
        if (display_result) {
-               cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|\n",
+               cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|%d|%ld|\n",
                        CIT_OK, CtdlCheckExpress(),
                        truncated_roomname,
                        (int)new_messages,
@@ -934,7 +866,9 @@ void usergoto(char *where, int display_result, int transiently,
                        (int)CC->room.QRfloor,
                        (int)vbuf.v_view,
                        (int)CC->room.QRdefaultview,
-                       (int)is_trash
+                       (int)is_trash,
+                       (int)CC->room.QRflags2,
+                       (long)CC->room.QRmtime
                );
        }
 }
@@ -945,7 +879,7 @@ void usergoto(char *where, int display_result, int transiently,
  */
 void convert_room_name_macros(char *towhere, size_t maxlen) {
        if (!strcasecmp(towhere, "_BASEROOM_")) {
-               safestrncpy(towhere, config.c_baseroom, maxlen);
+               safestrncpy(towhere, CtdlGetConfigStr("c_baseroom"), maxlen);
        }
        else if (!strcasecmp(towhere, "_MAIL_")) {
                safestrncpy(towhere, MAILROOM, maxlen);
@@ -953,8 +887,11 @@ void convert_room_name_macros(char *towhere, size_t maxlen) {
        else if (!strcasecmp(towhere, "_TRASH_")) {
                safestrncpy(towhere, USERTRASHROOM, maxlen);
        }
+       else if (!strcasecmp(towhere, "_DRAFTS_")) {
+               safestrncpy(towhere, USERDRAFTROOM, maxlen);
+       }
        else if (!strcasecmp(towhere, "_BITBUCKET_")) {
-               safestrncpy(towhere, config.c_twitroom, maxlen);
+               safestrncpy(towhere, CtdlGetConfigStr("c_twitroom"), maxlen);
        }
        else if (!strcasecmp(towhere, "_CALENDAR_")) {
                safestrncpy(towhere, USERCALENDARROOM, maxlen);
@@ -971,233 +908,6 @@ void convert_room_name_macros(char *towhere, size_t maxlen) {
 }
 
 
-/* 
- * cmd_goto()  -  goto a new room
- */
-void cmd_goto(char *gargs)
-{
-       struct ctdlroom QRscratch;
-       int c;
-       int ok = 0;
-       int ra;
-       char augmented_roomname[ROOMNAMELEN];
-       char towhere[ROOMNAMELEN];
-       char password[32];
-       int transiently = 0;
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       extract_token(towhere, gargs, 0, '|', sizeof towhere);
-       extract_token(password, gargs, 1, '|', sizeof password);
-       transiently = extract_int(gargs, 2);
-
-       getuser(&CC->user, CC->curr_user);
-
-       /*
-        * Handle some of the macro named rooms
-        */
-       convert_room_name_macros(towhere, sizeof towhere);
-
-       /* First try a regular match */
-       c = getroom(&QRscratch, towhere);
-
-       /* Then try a mailbox name match */
-       if (c != 0) {
-               MailboxName(augmented_roomname, sizeof augmented_roomname,
-                           &CC->user, towhere);
-               c = getroom(&QRscratch, augmented_roomname);
-               if (c == 0)
-                       safestrncpy(towhere, augmented_roomname, sizeof towhere);
-       }
-
-       /* And if the room was found... */
-       if (c == 0) {
-
-               /* Let internal programs go directly to any room. */
-               if (CC->internal_pgm) {
-                       memcpy(&CC->room, &QRscratch,
-                               sizeof(struct ctdlroom));
-                       usergoto(NULL, 1, transiently, NULL, NULL);
-                       return;
-               }
-
-               /* See if there is an existing user/room relationship */
-               CtdlRoomAccess(&QRscratch, &CC->user, &ra, NULL);
-
-               /* normal clients have to pass through security */
-               if (ra & UA_GOTOALLOWED) {
-                       ok = 1;
-               }
-
-               if (ok == 1) {
-                       if ((QRscratch.QRflags & QR_MAILBOX) &&
-                           ((ra & UA_GOTOALLOWED))) {
-                               memcpy(&CC->room, &QRscratch,
-                                       sizeof(struct ctdlroom));
-                               usergoto(NULL, 1, transiently, NULL, NULL);
-                               return;
-                       } else if ((QRscratch.QRflags & QR_PASSWORDED) &&
-                           ((ra & UA_KNOWN) == 0) &&
-                           (strcasecmp(QRscratch.QRpasswd, password)) &&
-                           (CC->user.axlevel < 6)
-                           ) {
-                               cprintf("%d wrong or missing passwd\n",
-                                       ERROR + PASSWORD_REQUIRED);
-                               return;
-                       } else if ((QRscratch.QRflags & QR_PRIVATE) &&
-                                  ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
-                                  ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
-                                  ((ra & UA_KNOWN) == 0) &&
-                                  (CC->user.axlevel < 6)
-                                  ) {
-                               lprintf(CTDL_DEBUG, "Failed to acquire private room\n");
-                       } else {
-                               memcpy(&CC->room, &QRscratch,
-                                       sizeof(struct ctdlroom));
-                               usergoto(NULL, 1, transiently, NULL, NULL);
-                               return;
-                       }
-               }
-       }
-
-       cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
-}
-
-
-void cmd_whok(void)
-{
-       struct ctdluser temp;
-       struct cdbdata *cdbus;
-       int ra;
-
-       cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
-       cdb_rewind(CDB_USERS);
-       while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
-               memset(&temp, 0, sizeof temp);
-               memcpy(&temp, cdbus->ptr, sizeof temp);
-               cdb_free(cdbus);
-
-               CtdlRoomAccess(&CC->room, &temp, &ra, NULL);
-               if ((CC->room.QRflags & QR_INUSE)
-                   && (ra & UA_KNOWN)
-                   )
-                       cprintf("%s\n", temp.fullname);
-       }
-       cprintf("000\n");
-}
-
-
-/*
- * RDIR command for room directory
- */
-void cmd_rdir(void)
-{
-       char buf[256];
-       char flnm[256];
-       char comment[256];
-       FILE *ls, *fd;
-       struct stat statbuf;
-       char tempfilename[PATH_MAX];
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-       CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
-       
-       getroom(&CC->room, CC->room.QRname);
-       getuser(&CC->user, CC->curr_user);
-
-       if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
-               cprintf("%d not here.\n", ERROR + NOT_HERE);
-               return;
-       }
-       if (((CC->room.QRflags & QR_VISDIR) == 0)
-           && (CC->user.axlevel < 6)
-           && (CC->user.usernum != CC->room.QRroomaide)) {
-               cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
-       cprintf("%d %s|%s/%s\n",
-                       LISTING_FOLLOWS, 
-                       config.c_fqdn,
-                       ctdl_file_dir, 
-                       CC->room.QRdirname);
-
-       snprintf(buf, sizeof buf, 
-                        "ls %s/%s >%s 2>/dev/null",
-                        ctdl_file_dir,
-                        CC->room.QRdirname, 
-                        tempfilename);
-       system(buf);
-
-       snprintf(buf, sizeof buf, 
-                        "%s/%s/filedir",
-                        ctdl_file_dir,
-                        CC->room.QRdirname);
-       fd = fopen(buf, "r");
-       if (fd == NULL)
-               fd = fopen("/dev/null", "r");
-
-       ls = fopen(tempfilename, "r");
-       while (fgets(flnm, sizeof flnm, ls) != NULL) {
-               flnm[strlen(flnm) - 1] = 0;
-               if (strcasecmp(flnm, "filedir")) {
-                       snprintf(buf, sizeof buf, 
-                                        "%s/%s/%s",
-                                        ctdl_file_dir,
-                                        CC->room.QRdirname,
-                                        flnm);
-                       stat(buf, &statbuf);
-                       safestrncpy(comment, "", sizeof comment);
-                       fseek(fd, 0L, 0);
-                       while ((fgets(buf, sizeof buf, fd) != NULL)
-                              && (strlen(comment) == 0)) {
-                               buf[strlen(buf) - 1] = 0;
-                               if ((!strncasecmp(buf, flnm, strlen(flnm)))
-                                   && (buf[strlen(flnm)] == ' '))
-                                       safestrncpy(comment,
-                                           &buf[strlen(flnm) + 1],
-                                           sizeof comment);
-                       }
-                       cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment);
-               }
-       }
-       fclose(ls);
-       fclose(fd);
-       unlink(tempfilename);
-
-       cprintf("000\n");
-}
-
-/*
- * get room parameters (aide or room aide command)
- */
-void cmd_getr(void)
-{
-       if (CtdlAccessCheck(ac_room_aide)) return;
-
-       getroom(&CC->room, CC->room.QRname);
-       cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
-               CIT_OK,
-               CtdlCheckExpress(),
-
-               ((CC->room.QRflags & QR_MAILBOX) ?
-                       &CC->room.QRname[11] : CC->room.QRname),
-
-               ((CC->room.QRflags & QR_PASSWORDED) ?
-                       CC->room.QRpasswd : ""),
-
-               ((CC->room.QRflags & QR_DIRECTORY) ?
-                       CC->room.QRdirname : ""),
-
-               CC->room.QRflags,
-               (int) CC->room.QRfloor,
-               (int) CC->room.QRorder,
-
-               CC->room.QRdefaultview,
-               CC->room.QRflags2
-               );
-}
-
-
 /*
  * Back end function to rename a room.
  * You can also specify which floor to move the room to, or specify -1 to
@@ -1216,11 +926,10 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
        long owner = 0L;
        char actual_old_name[ROOMNAMELEN];
 
-       lprintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
-               old_name, new_name, new_floor);
+       syslog(LOG_DEBUG, "room_ops: CtdlRenameRoom(%s, %s, %d)", old_name, new_name, new_floor);
 
        if (new_floor >= 0) {
-               fl = cgetfloor(new_floor);
+               fl = CtdlGetCachedFloor(new_floor);
                if ((fl->f_flags & F_INUSE) == 0) {
                        return(crr_invalid_floor);
                }
@@ -1228,22 +937,21 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 
        begin_critical_section(S_ROOMS);
 
-       if ( (getroom(&qrtmp, new_name) == 0) 
-          && (strcasecmp(new_name, old_name)) ) {
+       if ( (CtdlGetRoom(&qrtmp, new_name) == 0) && (strcasecmp(new_name, old_name)) ) {
                ret = crr_already_exists;
        }
 
-       else if (getroom(&qrbuf, old_name) != 0) {
+       else if (CtdlGetRoom(&qrbuf, old_name) != 0) {
                ret = crr_room_not_found;
        }
 
-       else if ( (CC->user.axlevel < 6) && (!CC->internal_pgm)
+       else if ( (CC->user.axlevel < AxAideU) && (!CC->internal_pgm)
                  && (CC->user.usernum != qrbuf.QRroomaide)
                  && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) )  {
                ret = crr_access_denied;
        }
 
-       else if (is_noneditable(&qrbuf)) {
+       else if (CtdlIsNonEditable(&qrbuf)) {
                ret = crr_noneditable;
        }
 
@@ -1263,8 +971,9 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                }
 
                /* Reject change of floor for baseroom/aideroom */
-               if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN) ||
-                   !strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) {
+               if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN) ||
+                   !strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN))
+               {
                        new_floor = 0;
                }
 
@@ -1274,18 +983,16 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                        new_floor = old_floor;
                }
                qrbuf.QRfloor = new_floor;
-               putroom(&qrbuf);
+               CtdlPutRoom(&qrbuf);
 
                begin_critical_section(S_CONFIG);
        
                /* If baseroom/aideroom name changes, update config */
-               if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN)) {
-                       safestrncpy(config.c_baseroom, new_name, ROOMNAMELEN);
-                       put_config();
+               if (!strncasecmp(old_name, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN)) {
+                       CtdlSetConfigStr("c_baseroom", new_name);
                }
-               if (!strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) {
-                       safestrncpy(config.c_aideroom, new_name, ROOMNAMELEN);
-                       put_config();
+               if (!strncasecmp(old_name, CtdlGetConfigStr("c_aideroom"), ROOMNAMELEN)) {
+                       CtdlSetConfigStr("c_aideroom", new_name);
                }
        
                end_critical_section(S_CONFIG);
@@ -1307,11 +1014,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                lgetfloor(&flbuf, old_floor);
                --flbuf.f_ref_count;
                lputfloor(&flbuf, old_floor);
-               lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "room_ops: reference count for floor %d is now %d", old_floor, flbuf.f_ref_count);
                lgetfloor(&flbuf, new_floor);
                ++flbuf.f_ref_count;
                lputfloor(&flbuf, new_floor);
-               lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "room_ops: reference count for floor %d is now %d", new_floor, flbuf.f_ref_count);
        }
 
        /* ...and everybody say "YATTA!" */     
@@ -1320,252 +1027,19 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 
 
 /*
- * set room parameters (aide or room aide command)
- */
-void cmd_setr(char *args)
-{
-       char buf[256];
-       int new_order = 0;
-       int r;
-       int new_floor;
-       char new_name[ROOMNAMELEN];
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       if (num_parms(args) >= 6) {
-               new_floor = extract_int(args, 5);
-       } else {
-               new_floor = (-1);       /* don't change the floor */
-       }
-
-       /* When is a new name more than just a new name?  When the old name
-        * has a namespace prefix.
-        */
-       if (CC->room.QRflags & QR_MAILBOX) {
-               sprintf(new_name, "%010ld.", atol(CC->room.QRname) );
-       } else {
-               safestrncpy(new_name, "", sizeof new_name);
-       }
-       extract_token(&new_name[strlen(new_name)], args, 0, '|', (sizeof new_name - strlen(new_name)));
-
-       r = CtdlRenameRoom(CC->room.QRname, new_name, new_floor);
-
-       if (r == crr_room_not_found) {
-               cprintf("%d Internal error - room not found?\n", ERROR + INTERNAL_ERROR);
-       } else if (r == crr_already_exists) {
-               cprintf("%d '%s' already exists.\n",
-                       ERROR + ALREADY_EXISTS, new_name);
-       } else if (r == crr_noneditable) {
-               cprintf("%d Cannot edit this room.\n", ERROR + NOT_HERE);
-       } else if (r == crr_invalid_floor) {
-               cprintf("%d Target floor does not exist.\n",
-                       ERROR + INVALID_FLOOR_OPERATION);
-       } else if (r == crr_access_denied) {
-               cprintf("%d You do not have permission to edit '%s'\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED,
-                       CC->room.QRname);
-       } else if (r != crr_ok) {
-               cprintf("%d Error: CtdlRenameRoom() returned %d\n",
-                       ERROR + INTERNAL_ERROR, r);
-       }
-
-       if (r != crr_ok) {
-               return;
-       }
-
-       getroom(&CC->room, new_name);
-
-       /* Now we have to do a bunch of other stuff */
-
-       if (num_parms(args) >= 7) {
-               new_order = extract_int(args, 6);
-               if (new_order < 1)
-                       new_order = 1;
-               if (new_order > 127)
-                       new_order = 127;
-       }
-
-       lgetroom(&CC->room, CC->room.QRname);
-
-       /* Directory room */
-       extract_token(buf, args, 2, '|', sizeof buf);
-       buf[15] = 0;
-       safestrncpy(CC->room.QRdirname, buf,
-               sizeof CC->room.QRdirname);
-
-       /* Default view */
-       if (num_parms(args) >= 8) {
-               CC->room.QRdefaultview = extract_int(args, 7);
-       }
-
-       /* Second set of flags */
-       if (num_parms(args) >= 9) {
-               CC->room.QRflags2 = extract_int(args, 8);
-       }
-
-       /* Misc. flags */
-       CC->room.QRflags = (extract_int(args, 3) | QR_INUSE);
-       /* Clean up a client boo-boo: if the client set the room to
-        * guess-name or passworded, ensure that the private flag is
-        * also set.
-        */
-       if ((CC->room.QRflags & QR_GUESSNAME)
-           || (CC->room.QRflags & QR_PASSWORDED))
-               CC->room.QRflags |= QR_PRIVATE;
-
-       /* Some changes can't apply to BASEROOM */
-       if (!strncasecmp(CC->room.QRname, config.c_baseroom,
-                        ROOMNAMELEN)) {
-               CC->room.QRorder = 0;
-               CC->room.QRpasswd[0] = '\0';
-               CC->room.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED &
-                       QR_GUESSNAME & QR_PREFONLY & QR_MAILBOX);
-               CC->room.QRflags |= QR_PERMANENT;
-       } else {        
-               /* March order (doesn't apply to AIDEROOM) */
-               if (num_parms(args) >= 7)
-                       CC->room.QRorder = (char) new_order;
-               /* Room password */
-               extract_token(buf, args, 1, '|', sizeof buf);
-               buf[10] = 0;
-               safestrncpy(CC->room.QRpasswd, buf,
-                           sizeof CC->room.QRpasswd);
-               /* Kick everyone out if the client requested it
-                * (by changing the room's generation number)
-                */
-               if (extract_int(args, 4)) {
-                       time(&CC->room.QRgen);
-               }
-       }
-       /* Some changes can't apply to AIDEROOM */
-       if (!strncasecmp(CC->room.QRname, config.c_baseroom,
-                        ROOMNAMELEN)) {
-               CC->room.QRorder = 0;
-               CC->room.QRflags &= ~QR_MAILBOX;
-               CC->room.QRflags |= QR_PERMANENT;
-       }
-
-       /* Write the room record back to disk */
-       lputroom(&CC->room);
-
-       /* Create a room directory if necessary */
-       if (CC->room.QRflags & QR_DIRECTORY) {
-               snprintf(buf, sizeof buf,"%s/%s",
-                                ctdl_file_dir,
-                                CC->room.QRdirname);
-               mkdir(buf, 0755);
-       }
-       snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
-               CC->room.QRname, CC->curr_user);
-       aide_message(buf, "Room modification Message");
-       cprintf("%d Ok\n", CIT_OK);
-}
-
-
-
-/* 
- * get the name of the room aide for this room
- */
-void cmd_geta(void)
-{
-       struct ctdluser usbuf;
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) {
-               cprintf("%d %s\n", CIT_OK, usbuf.fullname);
-       } else {
-               cprintf("%d \n", CIT_OK);
-       }
-}
-
-
-/* 
- * set the room aide for this room
- */
-void cmd_seta(char *new_ra)
-{
-       struct ctdluser usbuf;
-       long newu;
-       char buf[SIZ];
-       int post_notice;
-
-       if (CtdlAccessCheck(ac_room_aide)) return;
-
-       if (getuser(&usbuf, new_ra) != 0) {
-               newu = (-1L);
-       } else {
-               newu = usbuf.usernum;
-       }
-
-       lgetroom(&CC->room, CC->room.QRname);
-       post_notice = 0;
-       if (CC->room.QRroomaide != newu) {
-               post_notice = 1;
-       }
-       CC->room.QRroomaide = newu;
-       lputroom(&CC->room);
-
-       /*
-        * We have to post the change notice _after_ writing changes to 
-        * the room table, otherwise it would deadlock!
-        */
-       if (post_notice == 1) {
-               if (strlen(usbuf.fullname) > 0)
-                       snprintf(buf, sizeof buf,
-                               "%s is now the room aide for \"%s\".\n",
-                               usbuf.fullname, CC->room.QRname);
-               else
-                       snprintf(buf, sizeof buf,
-                               "There is now no room aide for \"%s\".\n",
-                               CC->room.QRname);
-               aide_message(buf, "Aide Room Modification");
-       }
-       cprintf("%d Ok\n", CIT_OK);
-}
-
-/* 
- * retrieve info file for this room
- */
-void cmd_rinf(void)
-{
-       char filename[128];
-       char buf[SIZ];
-       FILE *info_fp;
-
-       assoc_file_name(filename, sizeof filename, &CC->room, ctdl_info_dir);
-       info_fp = fopen(filename, "r");
-
-       if (info_fp == NULL) {
-               cprintf("%d No info file.\n", ERROR + FILE_NOT_FOUND);
-               return;
-       }
-       cprintf("%d Info:\n", LISTING_FOLLOWS);
-       while (fgets(buf, sizeof buf, info_fp) != NULL) {
-               if (strlen(buf) > 0)
-                       buf[strlen(buf) - 1] = 0;
-               cprintf("%s\n", buf);
-       }
-       cprintf("000\n");
-       fclose(info_fp);
-}
-
-/*
- * Asynchronously schedule a room for deletion.  The room will appear
- * deleted to the user(s), but it won't actually get purged from the
- * database until THE DREADED AUTO-PURGER makes its next run.
+ * Asynchronously schedule a room for deletion.  By placing the room into an invalid private namespace,
+ * the room will appear deleted to the user(s), but the session doesn't need to block while waiting for
+ * database operations to complete.  Instead, the room gets purged when THE DREADED AUTO-PURGER makes
+ * its next run.  Aren't we so clever?!!
  */
-void schedule_room_for_deletion(struct ctdlroom *qrbuf)
-{
+void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) {
        char old_name[ROOMNAMELEN];
        static int seq = 0;
 
-       lprintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
-               qrbuf->QRname);
+       syslog(LOG_NOTICE, "room_ops: scheduling room <%s> for deletion", qrbuf->QRname);
 
        safestrncpy(old_name, qrbuf->QRname, sizeof old_name);
-
-       getroom(qrbuf, qrbuf->QRname);
+       CtdlGetRoom(qrbuf, qrbuf->QRname);
 
        /* Turn the room into a private mailbox owned by a user who doesn't
         * exist.  This will immediately make the room invisible to everyone,
@@ -1578,39 +1052,26 @@ void schedule_room_for_deletion(struct ctdlroom *qrbuf)
        );
        qrbuf->QRflags |= QR_MAILBOX;
        time(&qrbuf->QRgen);    /* Use a timestamp as the new generation number  */
-
-       putroom(qrbuf);
-
+       CtdlPutRoom(qrbuf);
        b_deleteroom(old_name);
 }
 
 
-
 /*
  * Back end processing to delete a room and everything associated with it
  * (This one is synchronous and should only get called by THE DREADED
  * AUTO-PURGER in serv_expire.c.  All user-facing code should call
  * the asynchronous schedule_room_for_deletion() instead.)
  */
-void delete_room(struct ctdlroom *qrbuf)
-{
+void CtdlDeleteRoom(struct ctdlroom *qrbuf) {
        struct floor flbuf;
-       char filename[100];
-       /* TODO: filename magic? does this realy work? */
-
-       lprintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
+       char configdbkeyname[25];
 
-       /* Delete the info file */
-       assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
-       unlink(filename);
+       syslog(LOG_NOTICE, "room_ops: deleting room <%s>", qrbuf->QRname);
 
-       /* Delete the image file */
-       assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir);
-       unlink(filename);
-
-       /* Delete the room's network config file */
-       assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
-       unlink(filename);
+       /* Delete the room's network configdb entry */
+       netcfg_keyname(configdbkeyname, qrbuf->QRnumber);
+       CtdlDelConfig(configdbkeyname);
 
        /* Delete the messages in the room
         * (Careful: this opens an S_ROOMS critical section!)
@@ -1618,9 +1079,9 @@ void delete_room(struct ctdlroom *qrbuf)
        CtdlDeleteMessages(qrbuf->QRname, NULL, 0, "");
 
        /* Flag the room record as not in use */
-       lgetroom(qrbuf, qrbuf->QRname);
+       CtdlGetRoomLock(qrbuf, qrbuf->QRname);
        qrbuf->QRflags = 0;
-       lputroom(qrbuf);
+       CtdlPutRoomLock(qrbuf);
 
        /* then decrement the reference count for the floor */
        lgetfloor(&flbuf, (int) (qrbuf->QRfloor));
@@ -1632,7 +1093,6 @@ void delete_room(struct ctdlroom *qrbuf)
 }
 
 
-
 /*
  * Check access control for deleting a room
  */
@@ -1642,7 +1102,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
                return(0);
        }
 
-       if (is_noneditable(qr)) {
+       if (CtdlIsNonEditable(qr)) {
                return(0);
        }
 
@@ -1665,58 +1125,19 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
        }
 
        /*
-        * For normal rooms, just check for aide or room aide status.
+        * For normal rooms, just check for admin or room admin status.
         */
        return(is_room_aide());
 }
 
-/*
- * aide command: kill the current room
- */
-void cmd_kill(char *argbuf)
-{
-       char deleted_room_name[ROOMNAMELEN];
-       char msg[SIZ];
-       int kill_ok;
-
-       kill_ok = extract_int(argbuf, 0);
-
-       if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->room) == 0) {
-               cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
-               return;
-       }
-       if (kill_ok) {
-               if (CC->room.QRflags & QR_MAILBOX) {
-                       safestrncpy(deleted_room_name, &CC->room.QRname[11], sizeof deleted_room_name);
-               }
-               else {
-                       safestrncpy(deleted_room_name, CC->room.QRname, sizeof deleted_room_name);
-               }
-
-               /* Do the dirty work */
-               schedule_room_for_deletion(&CC->room);
-
-               /* Return to the Lobby */
-               usergoto(config.c_baseroom, 0, 0, NULL, NULL);
-
-               /* tell the world what we did */
-               snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
-                        deleted_room_name, CC->curr_user);
-               aide_message(msg, "Room Purger Message");
-               cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
-       } else {
-               cprintf("%d ok to delete.\n", CIT_OK);
-       }
-}
-
 
 /*
  * Internal code to create a new room (returns room flags)
  *
- * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only,
+ * Room types:  0=public, 1=hidden, 2=passworded, 3=invitation-only,
  *              4=mailbox, 5=mailbox, but caller supplies namespace
  */
-unsigned create_room(char *new_room_name,
+unsigned CtdlCreateRoom(char *new_room_name,
                     int new_room_type,
                     char *new_room_pass,
                     int new_room_floor,
@@ -1724,16 +1145,14 @@ unsigned create_room(char *new_room_name,
                     int avoid_access,
                     int new_room_view)
 {
-
        struct ctdlroom qrbuf;
        struct floor flbuf;
-       struct visit vbuf;
+       visit vbuf;
 
-       lprintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n",
-               new_room_name, new_room_type, new_room_view);
+       syslog(LOG_DEBUG, "room_ops: CtdlCreateRoom(name=%s, type=%d, view=%d)", new_room_name, new_room_type, new_room_view);
 
-       if (getroom(&qrbuf, new_room_name) == 0) {
-               lprintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
+       if (CtdlGetRoom(&qrbuf, new_room_name) == 0) {
+               syslog(LOG_DEBUG, "room_ops: cannot create room <%s> - already exists", new_room_name);
                return(0);
        }
 
@@ -1746,26 +1165,36 @@ unsigned create_room(char *new_room_name,
                qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
        if (new_room_type == 2)
                qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
-       if ( (new_room_type == 4) || (new_room_type == 5) )
+       if ( (new_room_type == 4) || (new_room_type == 5) ) {
                qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
+               /* qrbuf.QRflags2 |= QR2_SUBJECTREQ; */
+       }
 
        /* If the user is requesting a personal room, set up the room
         * name accordingly (prepend the user number)
         */
        if (new_room_type == 4) {
-               MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
+               CtdlMailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
        }
        else {
                safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
        }
 
        /* If the room is private, and the system administrator has elected
-        * to automatically grant room aide privileges, do so now; otherwise,
-        * set the room aide to undefined.
+        * to automatically grant room admin privileges, do so now.
         */
        if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) {
                qrbuf.QRroomaide = CC->user.usernum;
-       } else {
+       }
+       /* Blog owners automatically become room admins of their blogs.
+        * (In the future we will offer a site-wide configuration setting to suppress this behavior.)
+        */
+       else if (new_room_view == VIEW_BLOG) {
+               qrbuf.QRroomaide = CC->user.usernum;
+       }
+       /* Otherwise, set the room admin to undefined.
+        */
+       else {
                qrbuf.QRroomaide = (-1L);
        }
 
@@ -1782,7 +1211,7 @@ unsigned create_room(char *new_room_name,
        qrbuf.QRdefaultview = new_room_view;
 
        /* save what we just did... */
-       putroom(&qrbuf);
+       CtdlPutRoom(&qrbuf);
 
        /* bump the reference count on whatever floor the room is on */
        lgetfloor(&flbuf, (int) qrbuf.QRfloor);
@@ -1802,324 +1231,3 @@ unsigned create_room(char *new_room_name,
        /* resume our happy day */
        return (qrbuf.QRflags);
 }
-
-
-/*
- * create a new room
- */
-void cmd_cre8(char *args)
-{
-       int cre8_ok;
-       char new_room_name[ROOMNAMELEN];
-       int new_room_type;
-       char new_room_pass[32];
-       int new_room_floor;
-       int new_room_view;
-       char *notification_message = NULL;
-       unsigned newflags;
-       struct floor *fl;
-       int avoid_access = 0;
-
-       cre8_ok = extract_int(args, 0);
-       extract_token(new_room_name, args, 1, '|', sizeof new_room_name);
-       new_room_name[ROOMNAMELEN - 1] = 0;
-       new_room_type = extract_int(args, 2);
-       extract_token(new_room_pass, args, 3, '|', sizeof new_room_pass);
-       avoid_access = extract_int(args, 5);
-       new_room_view = extract_int(args, 6);
-       new_room_pass[9] = 0;
-       new_room_floor = 0;
-
-       if ((strlen(new_room_name) == 0) && (cre8_ok == 1)) {
-               cprintf("%d Invalid room name.\n", ERROR + ILLEGAL_VALUE);
-               return;
-       }
-
-       if (!strcasecmp(new_room_name, MAILROOM)) {
-               cprintf("%d '%s' already exists.\n",
-                       ERROR + ALREADY_EXISTS, new_room_name);
-               return;
-       }
-
-       if (num_parms(args) >= 5) {
-               fl = cgetfloor(extract_int(args, 4));
-               if (fl == NULL) {
-                       cprintf("%d Invalid floor number.\n",
-                               ERROR + INVALID_FLOOR_OPERATION);
-                       return;
-               }
-               else if ((fl->f_flags & F_INUSE) == 0) {
-                       cprintf("%d Invalid floor number.\n",
-                               ERROR + INVALID_FLOOR_OPERATION);
-                       return;
-               } else {
-                       new_room_floor = extract_int(args, 4);
-               }
-       }
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       if (CC->user.axlevel < config.c_createax || CC->internal_pgm) {
-               cprintf("%d You need higher access to create rooms.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
-
-       if ((strlen(new_room_name) == 0) && (cre8_ok == 0)) {
-               cprintf("%d Ok to create rooms.\n", CIT_OK);
-               return;
-       }
-
-       if ((new_room_type < 0) || (new_room_type > 5)) {
-               cprintf("%d Invalid room type.\n", ERROR + ILLEGAL_VALUE);
-               return;
-       }
-
-       if (new_room_type == 5) {
-               if (CC->user.axlevel < 6) {
-                       cprintf("%d Higher access required\n", 
-                               ERROR + HIGHER_ACCESS_REQUIRED);
-                       return;
-               }
-       }
-
-       /* Check to make sure the requested room name doesn't already exist */
-       newflags = create_room(new_room_name,
-                               new_room_type, new_room_pass, new_room_floor,
-                               0, avoid_access, new_room_view);
-       if (newflags == 0) {
-               cprintf("%d '%s' already exists.\n",
-                       ERROR + ALREADY_EXISTS, new_room_name);
-               return;
-       }
-
-       if (cre8_ok == 0) {
-               cprintf("%d OK to create '%s'\n", CIT_OK, new_room_name);
-               return;
-       }
-
-       /* If we reach this point, the room needs to be created. */
-
-       newflags = create_room(new_room_name,
-                          new_room_type, new_room_pass, new_room_floor, 1, 0,
-                          new_room_view);
-
-       /* post a message in Aide> describing the new room */
-       notification_message = malloc(1024);
-       snprintf(notification_message, 1024,
-               "A new room called \"%s\" has been created by %s%s%s%s%s%s\n",
-               new_room_name,
-               CC->user.fullname,
-               ((newflags & QR_MAILBOX) ? " [personal]" : ""),
-               ((newflags & QR_PRIVATE) ? " [private]" : ""),
-               ((newflags & QR_GUESSNAME) ? " [hidden]" : ""),
-               ((newflags & QR_PASSWORDED) ? " Password: " : ""),
-               ((newflags & QR_PASSWORDED) ? new_room_pass : "")
-       );
-       aide_message(notification_message, "Room Creation Message");
-       free(notification_message);
-
-       cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
-}
-
-
-
-void cmd_einf(char *ok)
-{                              /* enter info file for current room */
-       FILE *fp;
-       char infofilename[SIZ];
-       char buf[SIZ];
-
-       unbuffer_output();
-
-       if (CtdlAccessCheck(ac_room_aide)) return;
-
-       if (atoi(ok) == 0) {
-               cprintf("%d Ok.\n", CIT_OK);
-               return;
-       }
-       assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
-       lprintf(CTDL_DEBUG, "opening\n");
-       fp = fopen(infofilename, "w");
-       lprintf(CTDL_DEBUG, "checking\n");
-       if (fp == NULL) {
-               cprintf("%d Cannot open %s: %s\n",
-                 ERROR + INTERNAL_ERROR, infofilename, strerror(errno));
-               return;
-       }
-       cprintf("%d Send info...\n", SEND_LISTING);
-
-       do {
-               client_getln(buf, sizeof buf);
-               if (strcmp(buf, "000"))
-                       fprintf(fp, "%s\n", buf);
-       } while (strcmp(buf, "000"));
-       fclose(fp);
-
-       /* now update the room index so people will see our new info */
-       lgetroom(&CC->room, CC->room.QRname);           /* lock so no one steps on us */
-       CC->room.QRinfo = CC->room.QRhighest + 1L;
-       lputroom(&CC->room);
-}
-
-
-/* 
- * cmd_lflr()   -  List all known floors
- */
-void cmd_lflr(void)
-{
-       int a;
-       struct floor flbuf;
-
-       if (CtdlAccessCheck(ac_logged_in)) return;
-
-       cprintf("%d Known floors:\n", LISTING_FOLLOWS);
-
-       for (a = 0; a < MAXFLOORS; ++a) {
-               getfloor(&flbuf, a);
-               if (flbuf.f_flags & F_INUSE) {
-                       cprintf("%d|%s|%d\n",
-                               a,
-                               flbuf.f_name,
-                               flbuf.f_ref_count);
-               }
-       }
-       cprintf("000\n");
-}
-
-
-
-/*
- * create a new floor
- */
-void cmd_cflr(char *argbuf)
-{
-       char new_floor_name[256];
-       struct floor flbuf;
-       int cflr_ok;
-       int free_slot = (-1);
-       int a;
-
-       extract_token(new_floor_name, argbuf, 0, '|', sizeof new_floor_name);
-       cflr_ok = extract_int(argbuf, 1);
-
-       if (CtdlAccessCheck(ac_aide)) return;
-
-       if (strlen(new_floor_name) == 0) {
-               cprintf("%d Blank floor name not allowed.\n",
-                       ERROR + ILLEGAL_VALUE);
-               return;
-       }
-
-       for (a = 0; a < MAXFLOORS; ++a) {
-               getfloor(&flbuf, a);
-
-               /* note any free slots while we're scanning... */
-               if (((flbuf.f_flags & F_INUSE) == 0)
-                   && (free_slot < 0))
-                       free_slot = a;
-
-               /* check to see if it already exists */
-               if ((!strcasecmp(flbuf.f_name, new_floor_name))
-                   && (flbuf.f_flags & F_INUSE)) {
-                       cprintf("%d Floor '%s' already exists.\n",
-                               ERROR + ALREADY_EXISTS,
-                               flbuf.f_name);
-                       return;
-               }
-       }
-
-       if (free_slot < 0) {
-               cprintf("%d There is no space available for a new floor.\n",
-                       ERROR + INVALID_FLOOR_OPERATION);
-               return;
-       }
-       if (cflr_ok == 0) {
-               cprintf("%d ok to create...\n", CIT_OK);
-               return;
-       }
-       lgetfloor(&flbuf, free_slot);
-       flbuf.f_flags = F_INUSE;
-       flbuf.f_ref_count = 0;
-       safestrncpy(flbuf.f_name, new_floor_name, sizeof flbuf.f_name);
-       lputfloor(&flbuf, free_slot);
-       cprintf("%d %d\n", CIT_OK, free_slot);
-}
-
-
-
-/*
- * delete a floor
- */
-void cmd_kflr(char *argbuf)
-{
-       struct floor flbuf;
-       int floor_to_delete;
-       int kflr_ok;
-       int delete_ok;
-
-       floor_to_delete = extract_int(argbuf, 0);
-       kflr_ok = extract_int(argbuf, 1);
-
-       if (CtdlAccessCheck(ac_aide)) return;
-
-       lgetfloor(&flbuf, floor_to_delete);
-
-       delete_ok = 1;
-       if ((flbuf.f_flags & F_INUSE) == 0) {
-               cprintf("%d Floor %d not in use.\n",
-                       ERROR + INVALID_FLOOR_OPERATION, floor_to_delete);
-               delete_ok = 0;
-       } else {
-               if (flbuf.f_ref_count != 0) {
-                       cprintf("%d Cannot delete; floor contains %d rooms.\n",
-                               ERROR + INVALID_FLOOR_OPERATION,
-                               flbuf.f_ref_count);
-                       delete_ok = 0;
-               } else {
-                       if (kflr_ok == 1) {
-                               cprintf("%d Ok\n", CIT_OK);
-                       } else {
-                               cprintf("%d Ok to delete...\n", CIT_OK);
-                       }
-
-               }
-
-       }
-
-       if ((delete_ok == 1) && (kflr_ok == 1))
-               flbuf.f_flags = 0;
-       lputfloor(&flbuf, floor_to_delete);
-}
-
-/*
- * edit a floor
- */
-void cmd_eflr(char *argbuf)
-{
-       struct floor flbuf;
-       int floor_num;
-       int np;
-
-       np = num_parms(argbuf);
-       if (np < 1) {
-               cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
-               return;
-       }
-
-       if (CtdlAccessCheck(ac_aide)) return;
-
-       floor_num = extract_int(argbuf, 0);
-       lgetfloor(&flbuf, floor_num);
-       if ((flbuf.f_flags & F_INUSE) == 0) {
-               lputfloor(&flbuf, floor_num);
-               cprintf("%d Floor %d is not in use.\n",
-                       ERROR + INVALID_FLOOR_OPERATION, floor_num);
-               return;
-       }
-       if (np >= 2)
-               extract_token(flbuf.f_name, argbuf, 1, '|', sizeof flbuf.f_name);
-       lputfloor(&flbuf, floor_num);
-
-       cprintf("%d Ok\n", CIT_OK);
-}