#include "room_ops.h"
#include "sysdep_decls.h"
#include "support.h"
-#include "user_ops.h"
#include "msgbase.h"
#include "citserver.h"
#include "control.h"
#include "threads.h"
#include "ctdl_module.h"
+#include "user_ops.h"
struct floor *floorcache[MAXFLOORS];
/* 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);
vbuf.v_view = 0;
goto SKIP_EVERYTHING;
}
/* Force the properties of the Aide room */
if (!strcasecmp(roombuf->QRname, config.c_aideroom)) {
- if (userbuf->axlevel >= 6) {
+ if (userbuf->axlevel >= AxAideU) {
retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
} else {
retval = 0;
/* 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;
}
}
* - It is a read-only room
*/
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 (CC->user.axlevel < AxProbU) post_allowed = 0;
+ if ((CC->user.axlevel < AxNetU) && (CC->room.QRflags & QR_NETWORK)) post_allowed = 0;
if (roombuf->QRflags & QR_READONLY) post_allowed = 0;
if (post_allowed) {
retval = retval | UA_POSTALLOWED;
}
/* Aides get access to all private rooms */
- if ( (userbuf->axlevel >= 6)
+ if ( (userbuf->axlevel >= AxAideU)
&& ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
if (vbuf.v_flags & V_FORGET) {
retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
/* Aides can gain access to mailboxes as well, but they don't show
* by default.
*/
- if ( (userbuf->axlevel >= 6)
+ if ( (userbuf->axlevel >= AxAideU)
&& (roombuf->QRflags & QR_MAILBOX) ) {
retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
}
/* Aides and Room Aides have admin privileges */
- if ( (userbuf->axlevel >= 6)
+ if ( (userbuf->axlevel >= AxAideU)
|| (userbuf->usernum == roombuf->QRroomaide)
) {
retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED | UA_POSTALLOWED;
/*
- * 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];
}
/*
- * 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);
}
/*
- * 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);
}
/*
- * 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;
}
/*
- * 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;
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]);
/*
- * 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);
}
+
/*
- * 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;
/*
* 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 (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&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);
+ CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
cprintf("000\n");
}
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&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);
+ CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
cprintf("000\n");
}
cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
- ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
+ CtdlForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
cprintf("000\n");
}
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&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);
+ CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
cprintf("000\n");
}
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&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);
+ CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
cprintf("000\n");
}
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&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);
+ CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
cprintf("000\n");
}
* 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)
{
int a;
*/
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. */
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);
}
rmailflag = 0;
if ((CC->room.QRroomaide == CC->user.usernum)
- || (CC->user.axlevel >= 6))
+ || (CC->user.axlevel >= AxAideU))
raideflag = 1;
else
raideflag = 0;
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
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);
}
if (CC->internal_pgm) {
memcpy(&CC->room, &QRscratch,
sizeof(struct ctdlroom));
- usergoto(NULL, 1, transiently, NULL, NULL);
+ CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
return;
}
((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);
((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");
} else {
memcpy(&CC->room, &QRscratch,
sizeof(struct ctdlroom));
- usergoto(NULL, 1, transiently, NULL, NULL);
+ CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
return;
}
}
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;
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);
{
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(),
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);
}
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;
}
new_floor = old_floor;
}
qrbuf.QRfloor = new_floor;
- putroom(&qrbuf);
+ CtdlPutRoom(&qrbuf);
begin_critical_section(S_CONFIG);
return;
}
- getroom(&CC->room, new_name);
+ CtdlGetRoom(&CC->room, new_name);
/* Now we have to do a bunch of other stuff */
new_order = 127;
}
- lgetroom(&CC->room, CC->room.QRname);
+ CtdlGetRoomLock(&CC->room, CC->room.QRname);
/* Directory room */
extract_token(buf, args, 2, '|', sizeof buf);
}
/* 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) {
}
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");
+ CtdlAideMessage(buf, "Room modification Message");
cprintf("%d Ok\n", CIT_OK);
}
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);
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
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);
}
* 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;
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,
qrbuf->QRflags |= QR_MAILBOX;
time(&qrbuf->QRgen); /* Use a timestamp as the new generation number */
- putroom(qrbuf);
+ CtdlPutRoom(qrbuf);
b_deleteroom(old_name);
}
* 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];
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));
return(0);
}
- if (is_noneditable(qr)) {
+ if (CtdlIsNonEditable(qr)) {
return(0);
}
}
/* 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");
+ CtdlAideMessage(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,
struct floor flbuf;
struct visit vbuf;
- CtdlLogPrintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n",
+ CtdlLogPrintf(CTDL_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) {
+ if (CtdlGetRoom(&qrbuf, new_room_name) == 0) {
CtdlLogPrintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
return(0);
}
* 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);
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);
}
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);
}
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;
}
/* 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) {
/* 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);
((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);
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);
}
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,
}
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)
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", "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.");
+ }
/* return our Subversion id for the Log */
return "$Id$";
}
projects / citadel.git / blobdiff