X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=c9e651b155ab9d2f8a81a9f49caba3e07cdef84a;hb=a9d212c452ddc4c041c6b1ca30670dde9a321a07;hp=290190762835fb30b57845f82a6d2e887d1ec332;hpb=c1b1936458ccd0d517148615a6ed753f6a3e30c2;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 290190762..c9e651b15 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -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 | UA_DELETEALLOWED); + 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 */ @@ -344,6 +403,62 @@ void CtdlPutRoomLock(struct ctdlroom *qrbuf) /****************************************************************************/ + +/* + * 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; +} + + /* * CtdlGetFloor() - retrieve floor data from disk */ @@ -438,10 +553,11 @@ void CtdlPutFloor(struct floor *flbuf, int floor_num) } + /* - * lputfloor() - same as CtdlPutFloor() 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) { CtdlPutFloor(flbuf, floor_num); @@ -450,6 +566,16 @@ void lputfloor(struct floor *flbuf, int floor_num) } + +/* + * 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... */ @@ -606,12 +732,9 @@ 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); CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched); @@ -644,12 +767,9 @@ 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); CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched); @@ -680,7 +800,7 @@ 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); CtdlForEachRoom(cmd_lprm_backend, &FloorBeingSearched); cprintf("000\n"); @@ -713,12 +833,9 @@ 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); CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched); @@ -752,12 +869,9 @@ 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); CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched); @@ -791,12 +905,9 @@ 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); CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched); @@ -820,7 +931,7 @@ void CtdlUserGoto(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; @@ -917,7 +1028,7 @@ void CtdlUserGoto(char *where, int display_result, int transiently, rmailflag = 0; if ((CC->room.QRroomaide == CC->user.usernum) - || (CC->user.axlevel >= 6)) + || (CC->user.axlevel >= AxAideU)) raideflag = 1; else raideflag = 0; @@ -934,7 +1045,7 @@ void CtdlUserGoto(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", + syslog(LOG_DEBUG, "<%s> %d new of %d total messages\n", CC->room.QRname, new_messages, total_messages ); @@ -1012,13 +1123,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 @@ -1030,7 +1141,7 @@ void cmd_goto(char *gargs) /* 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 = CtdlGetRoom(&QRscratch, augmented_roomname); if (c == 0) @@ -1066,7 +1177,7 @@ void cmd_goto(char *gargs) } 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,9 +1186,9 @@ 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)); @@ -1105,9 +1216,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"); @@ -1133,14 +1245,14 @@ void cmd_rdir(char *cmdbuf) if (CtdlAccessCheck(ac_logged_in)) return; CtdlGetRoom(&CC->room, CC->room.QRname); - getuser(&CC->user, CC->curr_user); + 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; @@ -1176,7 +1288,7 @@ void cmd_rdir(char *cmdbuf) "\"%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 ); - aide_message(buf2, "Unusable data found in room directory"); + CtdlAideMessage(buf2, "Unusable data found in room directory"); continue; /* not a useable file type so don't show it */ } safestrncpy(comment, "", sizeof comment); @@ -1256,7 +1368,7 @@ 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) { @@ -1277,7 +1389,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { 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; @@ -1347,11 +1459,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!" */ @@ -1496,8 +1608,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); } @@ -1512,7 +1626,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); @@ -1532,7 +1646,7 @@ 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; @@ -1559,7 +1673,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); } @@ -1600,7 +1714,7 @@ 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); @@ -1638,7 +1752,7 @@ void CtdlDeleteRoom(struct ctdlroom *qrbuf) 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); @@ -1741,8 +1855,10 @@ void cmd_kill(char *argbuf) /* 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); @@ -1753,7 +1869,7 @@ 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 CtdlCreateRoom(char *new_room_name, @@ -1767,13 +1883,13 @@ unsigned CtdlCreateRoom(char *new_room_name, struct ctdlroom qrbuf; struct floor flbuf; - struct visit vbuf; + visit vbuf; - CtdlLogPrintf(CTDL_DEBUG, "CtdlCreateRoom(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 (CtdlGetRoom(&qrbuf, new_room_name) == 0) { - CtdlLogPrintf(CTDL_DEBUG, "%s already exists.\n", new_room_name); + syslog(LOG_DEBUG, "%s already exists.\n", new_room_name); return(0); } @@ -1795,19 +1911,27 @@ unsigned CtdlCreateRoom(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); } @@ -1918,7 +2042,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; @@ -1951,14 +2075,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); @@ -1981,9 +2105,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)); @@ -2013,7 +2137,7 @@ 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); @@ -2173,27 +2297,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"; }