Logging: log the number of messages in room with the message-syslog domain
[citadel.git] / citadel / room_ops.c
index a4e6a82dbe0ba27b86aac3f97047a2abb7f02045..408196c91873395d01406c872690d910b44a31df 100644 (file)
@@ -1,8 +1,21 @@
 /* 
- * $Id$
- * 
  * Server functions which perform operations on room objects.
  *
+ * Copyright (c) 1987-2011 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 as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -35,7 +48,6 @@
 #include "room_ops.h"
 #include "sysdep_decls.h"
 #include "support.h"
-#include "user_ops.h"
 #include "msgbase.h"
 #include "citserver.h"
 #include "control.h"
@@ -43,6 +55,7 @@
 #include "threads.h"
 
 #include "ctdl_module.h"
+#include "user_ops.h"
 
 struct floor *floorcache[MAXFLOORS];
 
@@ -53,22 +66,44 @@ 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) && (config.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 (userbuf->axlevel >= AxAideU) {
+                       retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED | UA_REPLYALLOWED;
                } else {
                        retval = 0;
                }
@@ -76,21 +111,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) {
@@ -99,8 +136,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;
                }
@@ -108,13 +146,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;
                }
        }
 
@@ -125,19 +163,36 @@ 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 (CC->room.QRflags2 & QR2_COLLABDEL) {
+               if (roombuf->QRflags2 & QR2_COLLABDEL) {
                        if (retval & UA_POSTALLOWED) {
                                retval = retval | UA_DELETEALLOWED;
                        }
@@ -148,42 +203,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 | UA_POSTALLOWED;
+       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 */
@@ -222,9 +281,9 @@ void room_sanity_check(struct ctdlroom *qrbuf)
 
 
 /*
- * 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, char *room_name)
 {
        struct cdbdata *cdbqr;
        char lowercase_name[ROOMNAMELEN];
@@ -270,12 +329,12 @@ int getroom(struct ctdlroom *qrbuf, char *room_name)
 }
 
 /*
- * 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, 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);
 }
@@ -315,9 +374,9 @@ void b_putroom(struct ctdlroom *qrbuf, char *room_name)
 
 
 /* 
- * 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);
 }
 
@@ -332,22 +391,78 @@ void b_deleteroom(char *room_name) {
 
 
 /*
- * lputroom()  -  same as putroom() but unlocks the record (if supported)
+ * CtdlPutRoomLock()  -  same as CtdlPutRoom() but unlocks the record (if supported)
  */
-void lputroom(struct ctdlroom *qrbuf)
+void CtdlPutRoomLock(struct ctdlroom *qrbuf)
 {
 
-       putroom(qrbuf);
+       CtdlPutRoom(qrbuf);
        end_critical_section(S_ROOMS);
 
 }
 
 /****************************************************************************/
 
+
+/*
+ * CtdlGetFloorByName()  -  retrieve the number of the named floor
+ * return < 0 if not found else return floor number
+ */
+int CtdlGetFloorByName(const char *floor_name)
+{
+       int a;
+       struct floor *flbuf = NULL;
+
+       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;
+}
+
+
+
+/*
+ * CtdlGetFloorByNameLock()  -  retrieve floor number for given floor and lock the floor list.
+ */
+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;
+}
+
+
 /*
- * getfloor()  -  retrieve floor data from disk
+ * CtdlGetFloor()  -  retrieve floor data from disk
  */
-void getfloor(struct floor *flbuf, int floor_num)
+void CtdlGetFloor(struct floor *flbuf, int floor_num)
 {
        struct cdbdata *cdbfl;
 
@@ -370,22 +485,22 @@ void getfloor(struct floor *flbuf, int floor_num)
 }
 
 /*
- * 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)
 {
 
        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;
@@ -405,7 +520,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]);
@@ -420,9 +535,9 @@ 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);
@@ -438,22 +553,33 @@ 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)
+void CtdlPutFloorLock(struct floor *flbuf, int floor_num)
 {
 
-       putfloor(flbuf, 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...
  */
-void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
+void CtdlForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
                void *in_data)
 {
        struct ctdlroom qrbuf;
@@ -535,7 +661,7 @@ 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 */
@@ -606,15 +732,12 @@ void cmd_lrms(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
 
-       if (getuser(&CC->user, CC->curr_user)) {
-               cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
-               return;
-       }
+       CtdlGetUser(&CC->user, CC->curr_user);
        cprintf("%d Accessible rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -644,15 +767,12 @@ void cmd_lkra(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
-               cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
-               return;
-       }
+       CtdlGetUser(&CC->user, CC->curr_user);
        cprintf("%d Known rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -680,9 +800,9 @@ void cmd_lprm(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
+       cprintf("%d Public rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -713,15 +833,12 @@ void cmd_lkrn(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
-               cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
-               return;
-       }
+       CtdlGetUser(&CC->user, CC->curr_user);
        cprintf("%d Rooms w/ new msgs:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -752,15 +869,12 @@ void cmd_lkro(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
-               cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
-               return;
-       }
+       CtdlGetUser(&CC->user, CC->curr_user);
        cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -791,15 +905,12 @@ void cmd_lzrm(char *argbuf)
        if (!IsEmptyStr(argbuf))
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
-               cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
-               return;
-       }
+       CtdlGetUser(&CC->user, CC->curr_user);
        cprintf("%d Zapped rooms:\n", LISTING_FOLLOWS);
 
-       ForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
+       CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
        cprintf("000\n");
 }
 
@@ -809,9 +920,10 @@ void cmd_lzrm(char *argbuf)
  * 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,
+void CtdlUserGoto(char *where, int display_result, int transiently,
                int *retmsgs, int *retnew)
 {
+       struct CitContext *CCC = CC;
        int a;
        int new_messages = 0;
        int old_messages = 0;
@@ -820,7 +932,7 @@ void usergoto(char *where, int display_result, int transiently,
        int rmailflag;
        int raideflag;
        int newmailcount = 0;
-       struct visit vbuf;
+       visit vbuf;
        char truncated_roomname[ROOMNAMELEN];
         struct cdbdata *cdbfr;
        long *msglist = NULL;
@@ -837,20 +949,20 @@ void usergoto(char *where, int display_result, int transiently,
         * we can skip the extra database fetch.
         */
        if (where != NULL) {
-               safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname);
-               getroom(&CC->room, where);
+               safestrncpy(CCC->room.QRname, where, sizeof CCC->room.QRname);
+               CtdlGetRoom(&CCC->room, where);
        }
 
        /* Take care of all the formalities. */
 
        begin_critical_section(S_USERS);
-       CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+       CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
        original_v_flags = vbuf.v_flags;
 
        /* 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))
+       if ((strcasecmp(CCC->room.QRname, config.c_logpages))
           && (transiently == 0) ) {
                vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
@@ -858,7 +970,7 @@ void usergoto(char *where, int display_result, int transiently,
        
        /* Only rewrite the database record if we changed something */
        if (vbuf.v_flags != original_v_flags) {
-               CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
+               CtdlSetRelationship(&vbuf, &CCC->user, &CCC->room);
        }
        end_critical_section(S_USERS);
 
@@ -866,14 +978,14 @@ void usergoto(char *where, int display_result, int transiently,
        newmailcount = NewMailCount();
 
        /* set info to 1 if the user needs to read the room's info file */
-       if (CC->room.QRinfo > vbuf.v_lastseen) {
+       if (CCC->room.QRinfo > vbuf.v_lastseen) {
                info = 1;
        }
 
-        cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
+        cdbfr = cdb_fetch(CDB_MSGLISTS, &CCC->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);
        }
@@ -911,20 +1023,20 @@ void usergoto(char *where, int display_result, int transiently,
 
        if (msglist != NULL) free(msglist);
 
-       if (CC->room.QRflags & QR_MAILBOX)
+       if (CCC->room.QRflags & QR_MAILBOX)
                rmailflag = 1;
        else
                rmailflag = 0;
 
-       if ((CC->room.QRroomaide == CC->user.usernum)
-           || (CC->user.axlevel >= 6))
+       if ((CCC->room.QRroomaide == CCC->user.usernum)
+           || (CCC->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) ) {
+       safestrncpy(truncated_roomname, CCC->room.QRname, sizeof truncated_roomname);
+       if ( (CCC->room.QRflags & QR_MAILBOX)
+          && (atol(CCC->room.QRname) == CCC->user.usernum) ) {
                safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
        }
 
@@ -934,12 +1046,12 @@ void usergoto(char *where, int display_result, int transiently,
 
        if (retmsgs != NULL) *retmsgs = total_messages;
        if (retnew != NULL) *retnew = new_messages;
-       CtdlLogPrintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
-               CC->room.QRname,
-               new_messages, total_messages
-       );
+       MSG_syslog(LOG_INFO, "<%s> %d new of %d total messages\n",
+                  CCC->room.QRname,
+                  new_messages, total_messages
+               );
 
-       CC->curr_view = (int)vbuf.v_view;
+       CCC->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|%d|\n",
@@ -948,17 +1060,17 @@ void usergoto(char *where, int display_result, int transiently,
                        (int)new_messages,
                        (int)total_messages,
                        (int)info,
-                       (int)CC->room.QRflags,
-                       (long)CC->room.QRhighest,
+                       (int)CCC->room.QRflags,
+                       (long)CCC->room.QRhighest,
                        (long)vbuf.v_lastseen,
                        (int)rmailflag,
                        (int)raideflag,
                        (int)newmailcount,
-                       (int)CC->room.QRfloor,
+                       (int)CCC->room.QRfloor,
                        (int)vbuf.v_view,
-                       (int)CC->room.QRdefaultview,
+                       (int)CCC->room.QRdefaultview,
                        (int)is_trash,
-                       (int)CC->room.QRflags2
+                       (int)CCC->room.QRflags2
                );
        }
 }
@@ -1012,13 +1124,13 @@ void cmd_goto(char *gargs)
        char password[32];
        int transiently = 0;
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) 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);
+       CtdlGetUser(&CC->user, CC->curr_user);
 
        /*
         * Handle some of the macro named rooms
@@ -1026,13 +1138,13 @@ void cmd_goto(char *gargs)
        convert_room_name_macros(towhere, sizeof towhere);
 
        /* First try a regular match */
-       c = getroom(&QRscratch, towhere);
+       c = CtdlGetRoom(&QRscratch, towhere);
 
        /* Then try a mailbox name match */
        if (c != 0) {
-               MailboxName(augmented_roomname, sizeof augmented_roomname,
+               CtdlMailboxName(augmented_roomname, sizeof augmented_roomname,
                            &CC->user, towhere);
-               c = getroom(&QRscratch, augmented_roomname);
+               c = CtdlGetRoom(&QRscratch, augmented_roomname);
                if (c == 0)
                        safestrncpy(towhere, augmented_roomname, sizeof towhere);
        }
@@ -1044,7 +1156,7 @@ void cmd_goto(char *gargs)
                if (CC->internal_pgm) {
                        memcpy(&CC->room, &QRscratch,
                                sizeof(struct ctdlroom));
-                       usergoto(NULL, 1, transiently, NULL, NULL);
+                       CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
                        return;
                }
 
@@ -1061,12 +1173,12 @@ void cmd_goto(char *gargs)
                            ((ra & UA_GOTOALLOWED))) {
                                memcpy(&CC->room, &QRscratch,
                                        sizeof(struct ctdlroom));
-                               usergoto(NULL, 1, transiently, NULL, NULL);
+                               CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
                                return;
                        } else if ((QRscratch.QRflags & QR_PASSWORDED) &&
                            ((ra & UA_KNOWN) == 0) &&
                            (strcasecmp(QRscratch.QRpasswd, password)) &&
-                           (CC->user.axlevel < 6)
+                           (CC->user.axlevel < AxAideU)
                            ) {
                                cprintf("%d wrong or missing passwd\n",
                                        ERROR + PASSWORD_REQUIRED);
@@ -1075,13 +1187,13 @@ void cmd_goto(char *gargs)
                                   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
                                   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
                                   ((ra & UA_KNOWN) == 0) &&
-                                  (CC->user.axlevel < 6)
+                                  (CC->user.axlevel < AxAideU)
                                   ) {
-                               CtdlLogPrintf(CTDL_DEBUG, "Failed to acquire private room\n");
+                               syslog(LOG_DEBUG, "Failed to acquire private room\n");
                        } else {
                                memcpy(&CC->room, &QRscratch,
                                        sizeof(struct ctdlroom));
-                               usergoto(NULL, 1, transiently, NULL, NULL);
+                               CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
                                return;
                        }
                }
@@ -1105,9 +1217,10 @@ void cmd_whok(char *cmdbuf)
                cdb_free(cdbus);
 
                CtdlRoomAccess(&CC->room, &temp, &ra, NULL);
-               if ((CC->room.QRflags & QR_INUSE)
-                   && (ra & UA_KNOWN)
-                   )
+               if ((!IsEmptyStr(temp.fullname)) && 
+                   (CC->room.QRflags & QR_INUSE) &&
+                   (ra & UA_KNOWN)
+                       )
                        cprintf("%s\n", temp.fullname);
        }
        cprintf("000\n");
@@ -1132,15 +1245,15 @@ void cmd_rdir(char *cmdbuf)
        
        if (CtdlAccessCheck(ac_logged_in)) return;
        
-       getroom(&CC->room, CC->room.QRname);
-       getuser(&CC->user, CC->curr_user);
+       CtdlGetRoom(&CC->room, CC->room.QRname);
+       CtdlGetUser(&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.axlevel < AxAideU)
            && (CC->user.usernum != CC->room.QRroomaide)) {
                cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
                return;
@@ -1172,8 +1285,11 @@ void cmd_rdir(char *cmdbuf)
                        stat(buf, &statbuf);    /* stat the file */
                        if (!(statbuf.st_mode & S_IFREG))
                        {
-                               snprintf(buf2, sizeof buf2, "Command RDIR found something that is not a useable file. It should be cleaned up.\n RDIR found this non regular file:\n%s\n", buf);
-                               aide_message(buf2, "RDIR found bad file");
+                               snprintf(buf2, sizeof buf2,
+                                       "\"%s\" appears in the file directory for room \"%s\" but is not a regular file.  Directories, named pipes, sockets, etc. are not usable in Citadel room directories.\n",
+                                       buf, CC->room.QRname
+                               );
+                               CtdlAideMessage(buf2, "Unusable data found in room directory");
                                continue;       /* not a useable file type so don't show it */
                        }
                        safestrncpy(comment, "", sizeof comment);
@@ -1211,7 +1327,7 @@ void cmd_getr(char *cmdbuf)
 {
        if (CtdlAccessCheck(ac_room_aide)) return;
 
-       getroom(&CC->room, CC->room.QRname);
+       CtdlGetRoom(&CC->room, CC->room.QRname);
        cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
                CIT_OK,
                CtdlCheckExpress(),
@@ -1253,11 +1369,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
        long owner = 0L;
        char actual_old_name[ROOMNAMELEN];
 
-       CtdlLogPrintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
+       syslog(LOG_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
                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);
                }
@@ -1265,22 +1381,22 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
 
        begin_critical_section(S_ROOMS);
 
-       if ( (getroom(&qrtmp, new_name) == 0) 
+       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;
        }
 
@@ -1311,7 +1427,7 @@ 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);
        
@@ -1344,11 +1460,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                lgetfloor(&flbuf, old_floor);
                --flbuf.f_ref_count;
                lputfloor(&flbuf, old_floor);
-               CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
                lgetfloor(&flbuf, new_floor);
                ++flbuf.f_ref_count;
                lputfloor(&flbuf, new_floor);
-               CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
+               syslog(LOG_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
        }
 
        /* ...and everybody say "YATTA!" */     
@@ -1410,7 +1526,7 @@ void cmd_setr(char *args)
                return;
        }
 
-       getroom(&CC->room, new_name);
+       CtdlGetRoom(&CC->room, new_name);
 
        /* Now we have to do a bunch of other stuff */
 
@@ -1422,7 +1538,7 @@ void cmd_setr(char *args)
                        new_order = 127;
        }
 
-       lgetroom(&CC->room, CC->room.QRname);
+       CtdlGetRoomLock(&CC->room, CC->room.QRname);
 
        /* Directory room */
        extract_token(buf, args, 2, '|', sizeof buf);
@@ -1483,7 +1599,7 @@ void cmd_setr(char *args)
        }
 
        /* Write the room record back to disk */
-       lputroom(&CC->room);
+       CtdlPutRoomLock(&CC->room);
 
        /* Create a room directory if necessary */
        if (CC->room.QRflags & QR_DIRECTORY) {
@@ -1493,8 +1609,10 @@ void cmd_setr(char *args)
                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");
+               CC->room.QRname,
+               (CC->logged_in ? CC->curr_user : "an administrator")
+       );
+       CtdlAideMessage(buf, "Room modification Message");
        cprintf("%d Ok\n", CIT_OK);
 }
 
@@ -1509,7 +1627,7 @@ void cmd_geta(char *cmdbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) {
+       if (CtdlGetUserByNumber(&usbuf, CC->room.QRroomaide) == 0) {
                cprintf("%d %s\n", CIT_OK, usbuf.fullname);
        } else {
                cprintf("%d \n", CIT_OK);
@@ -1529,19 +1647,19 @@ void cmd_seta(char *new_ra)
 
        if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (getuser(&usbuf, new_ra) != 0) {
+       if (CtdlGetUser(&usbuf, new_ra) != 0) {
                newu = (-1L);
        } else {
                newu = usbuf.usernum;
        }
 
-       lgetroom(&CC->room, CC->room.QRname);
+       CtdlGetRoomLock(&CC->room, CC->room.QRname);
        post_notice = 0;
        if (CC->room.QRroomaide != newu) {
                post_notice = 1;
        }
        CC->room.QRroomaide = newu;
-       lputroom(&CC->room);
+       CtdlPutRoomLock(&CC->room);
 
        /*
         * We have to post the change notice _after_ writing changes to 
@@ -1556,7 +1674,7 @@ void cmd_seta(char *new_ra)
                        snprintf(buf, sizeof buf,
                                "There is now no room aide for \"%s\".\n",
                                CC->room.QRname);
-               aide_message(buf, "Aide Room Modification");
+               CtdlAideMessage(buf, "Aide Room Modification");
        }
        cprintf("%d Ok\n", CIT_OK);
 }
@@ -1592,17 +1710,17 @@ void cmd_rinf(char *gargs)
  * deleted to the user(s), but it won't actually get purged from the
  * database until THE DREADED AUTO-PURGER makes its next run.
  */
-void schedule_room_for_deletion(struct ctdlroom *qrbuf)
+void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf)
 {
        char old_name[ROOMNAMELEN];
        static int seq = 0;
 
-       CtdlLogPrintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
+       syslog(LOG_NOTICE, "Scheduling room <%s> for deletion\n",
                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,
@@ -1616,7 +1734,7 @@ 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);
 }
@@ -1629,13 +1747,13 @@ void schedule_room_for_deletion(struct ctdlroom *qrbuf)
  * 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? */
 
-       CtdlLogPrintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
+       syslog(LOG_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
 
        /* Delete the info file */
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
@@ -1655,9 +1773,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));
@@ -1679,7 +1797,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
                return(0);
        }
 
-       if (is_noneditable(qr)) {
+       if (CtdlIsNonEditable(qr)) {
                return(0);
        }
 
@@ -1731,15 +1849,17 @@ void cmd_kill(char *argbuf)
                }
 
                /* Do the dirty work */
-               schedule_room_for_deletion(&CC->room);
+               CtdlScheduleRoomForDeletion(&CC->room);
 
                /* Return to the Lobby */
-               usergoto(config.c_baseroom, 0, 0, NULL, NULL);
+               CtdlUserGoto(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");
+                        deleted_room_name,
+                       (CC->logged_in ? CC->curr_user : "an administrator")
+               );
+               CtdlAideMessage(msg, "Room Purger Message");
                cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
        } else {
                cprintf("%d ok to delete.\n", CIT_OK);
@@ -1750,10 +1870,10 @@ void cmd_kill(char *argbuf)
 /*
  * 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,
@@ -1764,13 +1884,13 @@ unsigned create_room(char *new_room_name,
 
        struct ctdlroom qrbuf;
        struct floor flbuf;
-       struct visit vbuf;
+       visit vbuf;
 
-       CtdlLogPrintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n",
+       syslog(LOG_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)\n",
                new_room_name, new_room_type, new_room_view);
 
-       if (getroom(&qrbuf, new_room_name) == 0) {
-               CtdlLogPrintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
+       if (CtdlGetRoom(&qrbuf, new_room_name) == 0) {
+               syslog(LOG_DEBUG, "%s already exists.\n", new_room_name);
                return(0);
        }
 
@@ -1792,19 +1912,27 @@ unsigned create_room(char *new_room_name,
         * 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 aide privileges, do so now.
         */
        if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) {
                qrbuf.QRroomaide = CC->user.usernum;
-       } else {
+       }
+       /* Blog owners automatically become room aides 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 aide to undefined.
+        */
+       else {
                qrbuf.QRroomaide = (-1L);
        }
 
@@ -1821,7 +1949,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);
@@ -1881,7 +2009,7 @@ void cmd_cre8(char *args)
        }
 
        if (num_parms(args) >= 5) {
-               fl = cgetfloor(extract_int(args, 4));
+               fl = CtdlGetCachedFloor(extract_int(args, 4));
                if (fl == NULL) {
                        cprintf("%d Invalid floor number.\n",
                                ERROR + INVALID_FLOOR_OPERATION);
@@ -1915,7 +2043,7 @@ void cmd_cre8(char *args)
        }
 
        if (new_room_type == 5) {
-               if (CC->user.axlevel < 6) {
+               if (CC->user.axlevel < AxAideU) {
                        cprintf("%d Higher access required\n", 
                                ERROR + HIGHER_ACCESS_REQUIRED);
                        return;
@@ -1923,7 +2051,7 @@ void cmd_cre8(char *args)
        }
 
        /* Check to make sure the requested room name doesn't already exist */
-       newflags = create_room(new_room_name,
+       newflags = CtdlCreateRoom(new_room_name,
                                new_room_type, new_room_pass, new_room_floor,
                                0, avoid_access, new_room_view);
        if (newflags == 0) {
@@ -1939,7 +2067,7 @@ void cmd_cre8(char *args)
 
        /* If we reach this point, the room needs to be created. */
 
-       newflags = create_room(new_room_name,
+       newflags = CtdlCreateRoom(new_room_name,
                           new_room_type, new_room_pass, new_room_floor, 1, 0,
                           new_room_view);
 
@@ -1948,14 +2076,14 @@ void cmd_cre8(char *args)
        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,
+               (CC->logged_in ? CC->curr_user : "an administrator"),
                ((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");
+       CtdlAideMessage(notification_message, "Room Creation Message");
        free(notification_message);
 
        cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
@@ -1978,9 +2106,9 @@ void cmd_einf(char *ok)
                return;
        }
        assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
-       CtdlLogPrintf(CTDL_DEBUG, "opening\n");
+       syslog(LOG_DEBUG, "opening\n");
        fp = fopen(infofilename, "w");
-       CtdlLogPrintf(CTDL_DEBUG, "checking\n");
+       syslog(LOG_DEBUG, "checking\n");
        if (fp == NULL) {
                cprintf("%d Cannot open %s: %s\n",
                  ERROR + INTERNAL_ERROR, infofilename, strerror(errno));
@@ -1996,9 +2124,9 @@ void cmd_einf(char *ok)
        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 */
+       CtdlGetRoomLock(&CC->room, CC->room.QRname);            /* lock so no one steps on us */
        CC->room.QRinfo = CC->room.QRhighest + 1L;
-       lputroom(&CC->room);
+       CtdlPutRoomLock(&CC->room);
 }
 
 
@@ -2010,12 +2138,12 @@ void cmd_lflr(char *gargs)
        int a;
        struct floor flbuf;
 
-       if (CtdlAccessCheck(ac_logged_in)) return;
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
 
        cprintf("%d Known floors:\n", LISTING_FOLLOWS);
 
        for (a = 0; a < MAXFLOORS; ++a) {
-               getfloor(&flbuf, a);
+               CtdlGetFloor(&flbuf, a);
                if (flbuf.f_flags & F_INUSE) {
                        cprintf("%d|%s|%d\n",
                                a,
@@ -2051,7 +2179,7 @@ void cmd_cflr(char *argbuf)
        }
 
        for (a = 0; a < MAXFLOORS; ++a) {
-               getfloor(&flbuf, a);
+               CtdlGetFloor(&flbuf, a);
 
                /* note any free slots while we're scanning... */
                if (((flbuf.f_flags & F_INUSE) == 0)
@@ -2170,27 +2298,29 @@ void cmd_eflr(char *argbuf)
 
 CTDL_MODULE_INIT(room_ops)
 {
-       CtdlRegisterProtoHook(cmd_lrms, "LRMS", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lkra, "LKRA", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lkrn, "LKRN", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lkro, "LKRO", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lzrm, "LZRM", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lprm, "LPRM", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_goto, "GOTO", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_whok, "WHOK", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_rdir, "RDIR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_getr, "GETR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_setr, "SETR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_geta, "GETA", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_seta, "SETA", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_rinf, "RINF", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_kill, "KILL", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_cre8, "CRE8", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_einf, "EINF", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_lflr, "LFLR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_cflr, "CFLR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_kflr, "KFLR", "Autoconverted. TODO: document me.");
-       CtdlRegisterProtoHook(cmd_eflr, "EFLR", "Autoconverted. TODO: document me.");
+       if (!threading) {
+               CtdlRegisterProtoHook(cmd_lrms, "LRMS", "List rooms");
+               CtdlRegisterProtoHook(cmd_lkra, "LKRA", "List all known rooms");
+               CtdlRegisterProtoHook(cmd_lkrn, "LKRN", "List known rooms with new messages");
+               CtdlRegisterProtoHook(cmd_lkro, "LKRO", "List known rooms without new messages");
+               CtdlRegisterProtoHook(cmd_lzrm, "LZRM", "List zapped rooms");
+               CtdlRegisterProtoHook(cmd_lprm, "LPRM", "List public rooms");
+               CtdlRegisterProtoHook(cmd_goto, "GOTO", "Goto a named room");
+               CtdlRegisterProtoHook(cmd_whok, "WHOK", "List users who know this room");
+               CtdlRegisterProtoHook(cmd_rdir, "RDIR", "List files in room directory");
+               CtdlRegisterProtoHook(cmd_getr, "GETR", "Get room parameters");
+               CtdlRegisterProtoHook(cmd_setr, "SETR", "Set room parameters");
+               CtdlRegisterProtoHook(cmd_geta, "GETA", "Get the room aide name");
+               CtdlRegisterProtoHook(cmd_seta, "SETA", "Set the room aide for this room");
+               CtdlRegisterProtoHook(cmd_rinf, "RINF", "Fetch room info file");
+               CtdlRegisterProtoHook(cmd_kill, "KILL", "Kill (delete) the current room");
+               CtdlRegisterProtoHook(cmd_cre8, "CRE8", "Create a new room");
+               CtdlRegisterProtoHook(cmd_einf, "EINF", "Enter info file for the current room");
+               CtdlRegisterProtoHook(cmd_lflr, "LFLR", "List all known floors");
+               CtdlRegisterProtoHook(cmd_cflr, "CFLR", "Create a new floor");
+               CtdlRegisterProtoHook(cmd_kflr, "KFLR", "Kill a floor");
+               CtdlRegisterProtoHook(cmd_eflr, "EFLR", "Edit a floor");
+       }
         /* return our Subversion id for the Log */
-       return "$Id$";
+       return "room_ops";
 }