* Server functions which perform operations on room objects.
*
*/
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
+#include <ctype.h>
#include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <limits.h>
#include <errno.h>
#include "citadel.h"
#include "server.h"
+#include "serv_extensions.h"
#include "database.h"
#include "config.h"
#include "room_ops.h"
#include "citserver.h"
#include "control.h"
#include "tools.h"
+#include "citadel_dirs.h"
struct floor *floorcache[MAXFLOORS];
/*
* Generic routine for determining user access to rooms
*/
-int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
+void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf,
+ int *result, int *view)
{
int retval = 0;
struct visit vbuf;
/* for internal programs, always do everything */
if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) {
- return (UA_KNOWN | UA_GOTOALLOWED);
- }
- /* For mailbox rooms, only allow access to the owner */
- if (roombuf->QRflags & QR_MAILBOX) {
- if (userbuf->usernum != atol(roombuf->QRname)) {
- return (retval);
- }
+ retval = (UA_KNOWN | UA_GOTOALLOWED);
+ vbuf.v_view = 0;
+ goto SKIP_EVERYTHING;
}
+
/* Locate any applicable user/room relationships */
CtdlGetRelationship(&vbuf, userbuf, roombuf);
/* Force the properties of the Aide room */
- if (!strcasecmp(roombuf->QRname, AIDEROOM)) {
+ if (!strcasecmp(roombuf->QRname, config.c_aideroom)) {
if (userbuf->axlevel >= 6) {
retval = UA_KNOWN | UA_GOTOALLOWED;
} else {
}
goto NEWMSG;
}
- /* For mailboxes, we skip all the access stuff (and we've
- * already checked by this point that the mailbox belongs
- * to the user)
- */
- if (roombuf->QRflags & QR_MAILBOX) {
- retval = UA_KNOWN | UA_GOTOALLOWED;
- goto NEWMSG;
- }
+
/* If this is a public room, it's accessible... */
- if ((roombuf->QRflags & QR_PRIVATE) == 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) {
retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
}
}
+
/* For private rooms, check the generation number matchups */
- if (roombuf->QRflags & QR_PRIVATE) {
+ 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) {
retval = retval | UA_GOTOALLOWED;
}
}
+
+ /* For mailbox rooms, also check the generation number matchups */
+ if (roombuf->QRflags & QR_MAILBOX) {
+ if (userbuf->usernum == atol(roombuf->QRname)) {
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ }
+ /* An explicit match means the user belongs in this room */
+ if (vbuf.v_flags & V_ACCESS) {
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ }
+ }
+
/* Check to see if the user has forgotten this room */
if (vbuf.v_flags & V_FORGET) {
retval = retval & ~UA_KNOWN;
- retval = retval | UA_ZAPPED;
+ 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;
}
- /* Aides get access to everything */
- if (userbuf->axlevel >= 6) {
+ /* Aides get access to all private rooms */
+ if ( (userbuf->axlevel >= 6)
+ && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
if (vbuf.v_flags & V_FORGET) {
retval = retval | UA_GOTOALLOWED;
}
}
}
+ /* 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;
+ }
+
NEWMSG: /* By the way, we also check for the presence of new messages */
- if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+ if (is_msg_in_sequence_set(vbuf.v_seen, roombuf->QRhighest) == 0) {
retval = retval | UA_HASNEWMSGS;
}
- return (retval);
+
+ /* System rooms never show up in the list. */
+ if (roombuf->QRflags2 & QR2_SYSTEM) {
+ retval = retval & ~UA_KNOWN;
+ }
+
+SKIP_EVERYTHING:
+ /* Now give the caller the information it wants. */
+ if (result != NULL) *result = retval;
+ if (view != NULL) *view = vbuf.v_view;
}
/*
* Self-checking stuff for a room record read into memory
*/
-void room_sanity_check(struct quickroom *qrbuf)
+void room_sanity_check(struct ctdlroom *qrbuf)
{
/* Mailbox rooms are always on the lowest floor */
if (qrbuf->QRflags & QR_MAILBOX) {
}
/* Listing order of 0 is illegal except for base rooms */
if (qrbuf->QRorder == 0)
- if (!is_noneditable(qrbuf))
+ if (!(qrbuf->QRflags & QR_MAILBOX) &&
+ strncasecmp(qrbuf->QRname, config.c_baseroom, ROOMNAMELEN)
+ &&
+ strncasecmp(qrbuf->QRname, config.c_aideroom, ROOMNAMELEN))
qrbuf->QRorder = 64;
}
/*
* getroom() - retrieve room data from disk
*/
-int getroom(struct quickroom *qrbuf, char *room_name)
+int getroom(struct ctdlroom *qrbuf, char *room_name)
{
struct cdbdata *cdbqr;
char lowercase_name[ROOMNAMELEN];
}
lowercase_name[a] = 0;
- memset(qrbuf, 0, sizeof(struct quickroom));
+ memset(qrbuf, 0, sizeof(struct ctdlroom));
/* First, try the public namespace */
- cdbqr = cdb_fetch(CDB_QUICKROOM,
+ cdbqr = cdb_fetch(CDB_ROOMS,
lowercase_name, strlen(lowercase_name));
/* If that didn't work, try the user's personal namespace */
if (cdbqr == NULL) {
- sprintf(personal_lowercase_name, "%010ld.%s",
- CC->usersupp.usernum, lowercase_name);
- cdbqr = cdb_fetch(CDB_QUICKROOM,
+ snprintf(personal_lowercase_name,
+ sizeof personal_lowercase_name, "%010ld.%s",
+ CC->user.usernum, lowercase_name);
+ cdbqr = cdb_fetch(CDB_ROOMS,
personal_lowercase_name,
strlen(personal_lowercase_name));
}
if (cdbqr != NULL) {
memcpy(qrbuf, cdbqr->ptr,
- ((cdbqr->len > sizeof(struct quickroom)) ?
- sizeof(struct quickroom) : cdbqr->len));
+ ((cdbqr->len > sizeof(struct ctdlroom)) ?
+ sizeof(struct ctdlroom) : cdbqr->len));
cdb_free(cdbqr);
room_sanity_check(qrbuf);
/*
* lgetroom() - same as getroom() but locks the record (if supported)
*/
-int lgetroom(struct quickroom *qrbuf, char *room_name)
+int lgetroom(struct ctdlroom *qrbuf, char *room_name)
{
register int retval;
retval = getroom(qrbuf, room_name);
- if (retval == 0) begin_critical_section(S_QUICKROOM);
+ if (retval == 0) begin_critical_section(S_ROOMS);
return(retval);
}
* b_putroom() - back end to putroom() and b_deleteroom()
* (if the supplied buffer is NULL, delete the room record)
*/
-void b_putroom(struct quickroom *qrbuf, char *room_name)
+void b_putroom(struct ctdlroom *qrbuf, char *room_name)
{
char lowercase_name[ROOMNAMELEN];
int a;
}
if (qrbuf == NULL) {
- cdb_delete(CDB_QUICKROOM,
+ cdb_delete(CDB_ROOMS,
lowercase_name, strlen(lowercase_name));
} else {
time(&qrbuf->QRmtime);
- cdb_store(CDB_QUICKROOM,
+ cdb_store(CDB_ROOMS,
lowercase_name, strlen(lowercase_name),
- qrbuf, sizeof(struct quickroom));
+ qrbuf, sizeof(struct ctdlroom));
}
}
/*
* putroom() - store room data to disk
*/
-void putroom(struct quickroom *qrbuf) {
+void putroom(struct ctdlroom *qrbuf) {
b_putroom(qrbuf, qrbuf->QRname);
}
/*
* lputroom() - same as putroom() but unlocks the record (if supported)
*/
-void lputroom(struct quickroom *qrbuf)
+void lputroom(struct ctdlroom *qrbuf)
{
putroom(qrbuf);
- end_critical_section(S_QUICKROOM);
+ end_critical_section(S_ROOMS);
}
cdb_free(cdbfl);
} else {
if (floor_num == 0) {
- strcpy(flbuf->f_name, "Main Floor");
+ safestrncpy(flbuf->f_name, "Main Floor",
+ sizeof flbuf->f_name);
flbuf->f_flags = F_INUSE;
flbuf->f_ref_count = 3;
}
* This is strictly a performance hack.
*/
struct floor *cgetfloor(int floor_num) {
-
+ static int initialized = 0;
+ int i;
+ int fetch_new = 0;
+ struct floor *fl = NULL;
+
+ begin_critical_section(S_FLOORCACHE);
+ if (initialized == 0) {
+ for (i=0; i<MAXFLOORS; ++i) {
+ floorcache[floor_num] = NULL;
+ }
+ initialized = 1;
+ }
if (floorcache[floor_num] == NULL) {
- floorcache[floor_num] = mallok(sizeof(struct floor));
- getfloor(floorcache[floor_num], floor_num);
+ fetch_new = 1;
+ }
+ end_critical_section(S_FLOORCACHE);
+
+ if (fetch_new) {
+ fl = malloc(sizeof(struct floor));
+ getfloor(fl, floor_num);
+ begin_critical_section(S_FLOORCACHE);
+ if (floorcache[floor_num] != NULL) {
+ free(floorcache[floor_num]);
+ }
+ floorcache[floor_num] = fl;
+ end_critical_section(S_FLOORCACHE);
}
return(floorcache[floor_num]);
*/
void putfloor(struct floor *flbuf, int floor_num)
{
- cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int),
- flbuf, sizeof(struct floor));
-
/* If we've cached this, clear it out, 'cuz it's WRONG now! */
+ begin_critical_section(S_FLOORCACHE);
if (floorcache[floor_num] != NULL) {
- phree(floorcache[floor_num]);
+ free(floorcache[floor_num]);
+ floorcache[floor_num] = malloc(sizeof(struct floor));
+ memcpy(floorcache[floor_num], flbuf, sizeof(struct floor));
}
+ end_critical_section(S_FLOORCACHE);
+
+ cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int),
+ flbuf, sizeof(struct floor));
}
/*
* Traverse the room file...
*/
-void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
+void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
void *in_data)
{
- struct quickroom qrbuf;
+ struct ctdlroom qrbuf;
struct cdbdata *cdbqr;
- cdb_begin_transaction();
- cdb_rewind(CDB_QUICKROOM);
+ cdb_rewind(CDB_ROOMS);
- while (cdbqr = cdb_next_item(CDB_QUICKROOM), cdbqr != NULL) {
- memset(&qrbuf, 0, sizeof(struct quickroom));
+ while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) {
+ memset(&qrbuf, 0, sizeof(struct ctdlroom));
memcpy(&qrbuf, cdbqr->ptr,
- ((cdbqr->len > sizeof(struct quickroom)) ?
- sizeof(struct quickroom) : cdbqr->len));
+ ((cdbqr->len > sizeof(struct ctdlroom)) ?
+ sizeof(struct ctdlroom) : cdbqr->len));
cdb_free(cdbqr);
room_sanity_check(&qrbuf);
if (qrbuf.QRflags & QR_INUSE)
(*CallBack)(&qrbuf, in_data);
}
- cdb_end_transaction();
}
/*
* delete_msglist() - delete room message pointers
*/
-void delete_msglist(struct quickroom *whichroom)
+void delete_msglist(struct ctdlroom *whichroom)
{
struct cdbdata *cdbml;
/*
* Determine whether a given room is non-editable.
*/
-int is_noneditable(struct quickroom *qrbuf)
+int is_noneditable(struct ctdlroom *qrbuf)
{
- /* Lobby> and Aide> are non-editable */
- if (!strcasecmp(qrbuf->QRname, BASEROOM))
- return (1);
- else if (!strcasecmp(qrbuf->QRname, AIDEROOM))
- return (1);
-
- /* Mail> rooms are also non-editable */
- else if ( (qrbuf->QRflags & QR_MAILBOX)
+ /* Mail> rooms are non-editable */
+ if ( (qrbuf->QRflags & QR_MAILBOX)
&& (!strcasecmp(&qrbuf->QRname[11], MAILROOM)) )
return (1);
/* Everything else is editable */
- else
- return (0);
+ return (0);
}
/*
* Back-back-end for all room listing commands
*/
-void list_roomname(struct quickroom *qrbuf)
+void list_roomname(struct ctdlroom *qrbuf, int ra, int current_view, int default_view)
{
char truncated_roomname[ROOMNAMELEN];
- /* For mailbox rooms, chop off the owner prefix */
- if (qrbuf->QRflags & QR_MAILBOX) {
- strcpy(truncated_roomname, qrbuf->QRname);
- strcpy(truncated_roomname, &truncated_roomname[11]);
+ /* For my own mailbox rooms, chop off the owner prefix */
+ if ( (qrbuf->QRflags & QR_MAILBOX)
+ && (atol(qrbuf->QRname) == CC->user.usernum) ) {
+ safestrncpy(truncated_roomname, qrbuf->QRname, sizeof truncated_roomname);
+ safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
cprintf("%s", truncated_roomname);
}
/* For all other rooms, just display the name in its entirety */
}
/* ...and now the other parameters */
- cprintf("|%u|%d|%d\n",
+ cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n",
qrbuf->QRflags,
(int) qrbuf->QRfloor,
- (int) qrbuf->QRorder);
+ (int) qrbuf->QRorder,
+ (int) qrbuf->QRflags2,
+ ra,
+ current_view,
+ default_view,
+ qrbuf->QRmtime
+ );
}
/*
* cmd_lrms() - List all accessible rooms, known or forgotten
*/
-void cmd_lrms_backend(struct quickroom *qrbuf, void *data)
+void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data)
{
int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
- if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
- & (UA_KNOWN | UA_ZAPPED)))
+ if ((( ra & (UA_KNOWN | UA_ZAPPED)))
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lrms(char *argbuf)
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
return;
}
/*
* cmd_lkra() - List all known rooms
*/
-void cmd_lkra_backend(struct quickroom *qrbuf, void *data)
+void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data)
{
int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
- if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
- & (UA_KNOWN)))
+ if ((( ra & (UA_KNOWN)))
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkra(char *argbuf)
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
return;
}
+void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data)
+{
+ int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
+ FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
+
+ if ( ((qrbuf->QRflags & QR_PRIVATE) == 0)
+ && ((qrbuf->QRflags & QR_MAILBOX) == 0)
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
+}
+
+void cmd_lprm(char *argbuf)
+{
+ int FloorBeingSearched = (-1);
+ if (strlen(argbuf) > 0)
+ FloorBeingSearched = extract_int(argbuf, 0);
+
+ cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
+
+ ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
+ cprintf("000\n");
+}
+
+
+
/*
* cmd_lkrn() - List all known rooms with new messages
*/
-void cmd_lkrn_backend(struct quickroom *qrbuf, void *data)
+void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data)
{
- int ra;
int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
- ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_KNOWN)
&& (ra & UA_HASNEWMSGS)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkrn(char *argbuf)
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
return;
}
/*
* cmd_lkro() - List all known rooms
*/
-void cmd_lkro_backend(struct quickroom *qrbuf, void *data)
+void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data)
{
- int ra;
int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
- ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_KNOWN)
&& ((ra & UA_HASNEWMSGS) == 0)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lkro(char *argbuf)
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
return;
}
/*
* cmd_lzrm() - List all forgotten rooms
*/
-void cmd_lzrm_backend(struct quickroom *qrbuf, void *data)
+void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data)
{
- int ra;
int FloorBeingSearched = (-1);
+ int ra;
+ int view;
+
FloorBeingSearched = *(int *)data;
+ CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
- ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_GOTOALLOWED)
&& (ra & UA_ZAPPED)
&& ((qrbuf->QRfloor == (FloorBeingSearched))
|| ((FloorBeingSearched) < 0)))
- list_roomname(qrbuf);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lzrm(char *argbuf)
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
return;
}
}
-
-void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
+/*
+ * Make the specified room the current room for this session. No validation
+ * or access control is done here -- the caller should make sure that the
+ * specified room exists and is ok to access.
+ */
+void usergoto(char *where, int display_result, int transiently,
+ int *retmsgs, int *retnew)
{
int a;
int new_messages = 0;
+ int old_messages = 0;
int total_messages = 0;
int info = 0;
int rmailflag;
struct cdbdata *cdbfr;
long *msglist = NULL;
int num_msgs = 0;
+ unsigned int original_v_flags;
+ int num_sets;
+ int s;
+ char setstr[128], lostr[64], histr[64];
+ long lo, hi;
+ int is_trash = 0;
+
+ /* If the supplied room name is NULL, the caller wants us to know that
+ * it has already copied the room record into CC->room, so
+ * we can skip the extra database fetch.
+ */
+ if (where != NULL) {
+ safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname);
+ getroom(&CC->room, where);
+ }
- strcpy(CC->quickroom.QRname, where);
- getroom(&CC->quickroom, where);
+ /* Take care of all the formalities. */
- lgetuser(&CC->usersupp, CC->curr_user);
- CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+ begin_critical_section(S_USERS);
+ CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+ original_v_flags = vbuf.v_flags;
- /* Know the room ... but not if it's the page log room */
- if (strcasecmp(where, config.c_logpages)) {
+ /* Know the room ... but not if it's the page log room, or if the
+ * caller specified that we're only entering this room transiently.
+ */
+ if ((strcasecmp(CC->room.QRname, config.c_logpages))
+ && (transiently == 0) ) {
vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
vbuf.v_flags = vbuf.v_flags | V_ACCESS;
}
- CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
- lputuser(&CC->usersupp);
+
+ /* Only rewrite the database record if we changed something */
+ if (vbuf.v_flags != original_v_flags) {
+ CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
+ }
+ end_critical_section(S_USERS);
- /* check for new mail */
+ /* Check for new mail */
newmailcount = NewMailCount();
/* set info to 1 if the user needs to read the room's info file */
- if (CC->quickroom.QRinfo > vbuf.v_lastseen)
+ if (CC->room.QRinfo > vbuf.v_lastseen) {
info = 1;
+ }
get_mm();
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = mallok(cdbfr->len);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* usergoto() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
}
- if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
- if (msglist[a] > 0L) {
- ++total_messages;
- if (msglist[a] > vbuf.v_lastseen) {
- ++new_messages;
+ total_messages = 0;
+ for (a=0; a<num_msgs; ++a) {
+ if (msglist[a] > 0L) ++total_messages;
+ }
+ new_messages = num_msgs;
+ num_sets = num_tokens(vbuf.v_seen, ',');
+ for (s=0; s<num_sets; ++s) {
+ extract_token(setstr, vbuf.v_seen, s, ',', sizeof setstr);
+
+ extract_token(lostr, setstr, 0, ':', sizeof lostr);
+ if (num_tokens(setstr, ':') >= 2) {
+ extract_token(histr, setstr, 1, ':', sizeof histr);
+ if (!strcmp(histr, "*")) {
+ snprintf(histr, sizeof histr, "%ld", LONG_MAX);
+ }
+ }
+ else {
+ strcpy(histr, lostr);
+ }
+ lo = atol(lostr);
+ hi = atol(histr);
+
+ for (a=0; a<num_msgs; ++a) if (msglist[a] > 0L) {
+ if ((msglist[a] >= lo) && (msglist[a] <= hi)) {
+ ++old_messages;
+ msglist[a] = 0L;
}
}
}
+ new_messages = total_messages - old_messages;
- if (msglist != NULL) phree(msglist);
+ if (msglist != NULL) free(msglist);
- if (CC->quickroom.QRflags & QR_MAILBOX)
+ if (CC->room.QRflags & QR_MAILBOX)
rmailflag = 1;
else
rmailflag = 0;
- if ((CC->quickroom.QRroomaide == CC->usersupp.usernum)
- || (CC->usersupp.axlevel >= 6))
+ if ((CC->room.QRroomaide == CC->user.usernum)
+ || (CC->user.axlevel >= 6))
raideflag = 1;
else
raideflag = 0;
- strcpy(truncated_roomname, CC->quickroom.QRname);
- if (CC->quickroom.QRflags & QR_MAILBOX) {
- strcpy(truncated_roomname, &truncated_roomname[11]);
+ 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, &truncated_roomname[11], sizeof truncated_roomname);
+ }
+
+ if (!strcasecmp(truncated_roomname, USERTRASHROOM)) {
+ is_trash = 1;
}
if (retmsgs != NULL) *retmsgs = total_messages;
if (retnew != NULL) *retnew = new_messages;
- lprintf(9, "<%s> %d new of %d total messages\n",
- CC->quickroom.QRname, new_messages, total_messages);
+ lprintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
+ CC->room.QRname,
+ new_messages, total_messages
+ );
- if (display_result)
- cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
- OK, CtdlCheckExpress(),
+ CC->curr_view = (int)vbuf.v_view;
+
+ if (display_result) {
+ cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|\n",
+ CIT_OK, CtdlCheckExpress(),
truncated_roomname,
- new_messages, total_messages,
- info, CC->quickroom.QRflags,
- CC->quickroom.QRhighest,
- vbuf.v_lastseen,
- rmailflag, raideflag, newmailcount,
- CC->quickroom.QRfloor);
+ (int)new_messages,
+ (int)total_messages,
+ (int)info,
+ (int)CC->room.QRflags,
+ (long)CC->room.QRhighest,
+ (long)vbuf.v_lastseen,
+ (int)rmailflag,
+ (int)raideflag,
+ (int)newmailcount,
+ (int)CC->room.QRfloor,
+ (int)vbuf.v_view,
+ (int)CC->room.QRdefaultview,
+ (int)is_trash
+ );
+ }
+}
+
+/*
+ * Handle some of the macro named rooms
+ */
+void convert_room_name_macros(char *towhere, size_t maxlen) {
+ if (!strcasecmp(towhere, "_BASEROOM_")) {
+ safestrncpy(towhere, config.c_baseroom, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_MAIL_")) {
+ safestrncpy(towhere, MAILROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_TRASH_")) {
+ safestrncpy(towhere, USERTRASHROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_BITBUCKET_")) {
+ safestrncpy(towhere, config.c_twitroom, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_CALENDAR_")) {
+ safestrncpy(towhere, USERCALENDARROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_TASKS_")) {
+ safestrncpy(towhere, USERTASKSROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_CONTACTS_")) {
+ safestrncpy(towhere, USERCONTACTSROOM, maxlen);
+ }
+ else if (!strcasecmp(towhere, "_NOTES_")) {
+ safestrncpy(towhere, USERNOTESROOM, maxlen);
+ }
}
*/
void cmd_goto(char *gargs)
{
- struct quickroom QRscratch;
+ struct ctdlroom QRscratch;
int c;
int ok = 0;
int ra;
- char augmented_roomname[SIZ];
- char towhere[SIZ];
- char password[SIZ];
+ char augmented_roomname[ROOMNAMELEN];
+ char towhere[ROOMNAMELEN];
+ char password[32];
+ int transiently = 0;
if (CtdlAccessCheck(ac_logged_in)) return;
- extract(towhere, gargs, 0);
- extract(password, gargs, 1);
-
- getuser(&CC->usersupp, CC->curr_user);
-
- if (!strcasecmp(towhere, "_BASEROOM_"))
- strcpy(towhere, BASEROOM);
+ extract_token(towhere, gargs, 0, '|', sizeof towhere);
+ extract_token(password, gargs, 1, '|', sizeof password);
+ transiently = extract_int(gargs, 2);
- if (!strcasecmp(towhere, "_MAIL_"))
- strcpy(towhere, MAILROOM);
-
- if (!strcasecmp(towhere, "_BITBUCKET_"))
- strcpy(towhere, config.c_twitroom);
+ getuser(&CC->user, CC->curr_user);
+ /*
+ * Handle some of the macro named rooms
+ */
+ convert_room_name_macros(towhere, sizeof towhere);
/* First try a regular match */
c = getroom(&QRscratch, towhere);
/* Then try a mailbox name match */
if (c != 0) {
- MailboxName(augmented_roomname, &CC->usersupp, towhere);
+ MailboxName(augmented_roomname, sizeof augmented_roomname,
+ &CC->user, towhere);
c = getroom(&QRscratch, augmented_roomname);
if (c == 0)
- strcpy(towhere, augmented_roomname);
+ safestrncpy(towhere, augmented_roomname, sizeof towhere);
}
/* And if the room was found... */
if (c == 0) {
- /* let internal programs go directly to any room */
+ /* Let internal programs go directly to any room. */
if (CC->internal_pgm) {
- usergoto(towhere, 1, NULL, NULL);
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ usergoto(NULL, 1, transiently, NULL, NULL);
return;
}
/* See if there is an existing user/room relationship */
- ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
+ CtdlRoomAccess(&QRscratch, &CC->user, &ra, NULL);
/* normal clients have to pass through security */
- if (ra & UA_GOTOALLOWED)
+ if (ra & UA_GOTOALLOWED) {
ok = 1;
+ }
if (ok == 1) {
- if ((QRscratch.QRflags & QR_PASSWORDED) &&
+ if ((QRscratch.QRflags & QR_MAILBOX) &&
+ ((ra & UA_GOTOALLOWED))) {
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ usergoto(NULL, 1, transiently, NULL, NULL);
+ return;
+ } else if ((QRscratch.QRflags & QR_PASSWORDED) &&
((ra & UA_KNOWN) == 0) &&
- (strcasecmp(QRscratch.QRpasswd, password))
+ (strcasecmp(QRscratch.QRpasswd, password)) &&
+ (CC->user.axlevel < 6)
) {
cprintf("%d wrong or missing passwd\n",
ERROR + PASSWORD_REQUIRED);
} else if ((QRscratch.QRflags & QR_PRIVATE) &&
((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
- ((ra & UA_KNOWN) == 0)) {
- goto NOPE;
+ ((ra & UA_KNOWN) == 0) &&
+ (CC->user.axlevel < 6)
+ ) {
+ lprintf(CTDL_DEBUG, "Failed to acquire private room\n");
} else {
- usergoto(towhere, 1, NULL, NULL);
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ usergoto(NULL, 1, transiently, NULL, NULL);
return;
}
}
}
-NOPE: cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
+ cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
}
void cmd_whok(void)
{
- struct usersupp temp;
+ struct ctdluser temp;
struct cdbdata *cdbus;
+ int ra;
- cdb_begin_transaction();
- getuser(&CC->usersupp, CC->curr_user);
- if (CtdlAccessCheck(ac_room_aide)) return;
+ getuser(&CC->user, CC->curr_user);
+
+ /*
+ * This command is only allowed by aides, room aides,
+ * and room namespace owners
+ */
+ if (is_room_aide()
+ || (atol(CC->room.QRname) == CC->user.usernum) ) {
+ /* access granted */
+ }
+ else {
+ /* access denied */
+ cprintf("%d Higher access or room ownership required.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ return;
+ }
cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
- cdb_rewind(CDB_USERSUPP);
- while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
+ cdb_rewind(CDB_USERS);
+ while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
memset(&temp, 0, sizeof temp);
memcpy(&temp, cdbus->ptr, sizeof temp);
cdb_free(cdbus);
- if ((CC->quickroom.QRflags & QR_INUSE)
- && (CtdlRoomAccess(&CC->quickroom, &temp) & UA_KNOWN)
+ CtdlRoomAccess(&CC->room, &temp, &ra, NULL);
+ if ((CC->room.QRflags & QR_INUSE)
+ && (ra & UA_KNOWN)
)
cprintf("%s\n", temp.fullname);
}
- cdb_end_transaction();
cprintf("000\n");
}
*/
void cmd_rdir(void)
{
- char buf[SIZ];
- char flnm[SIZ];
- char comment[SIZ];
+ char buf[256];
+ char flnm[256];
+ char comment[256];
FILE *ls, *fd;
struct stat statbuf;
+ char tempfilename[PATH_MAX];
if (CtdlAccessCheck(ac_logged_in)) return;
+ CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
- getroom(&CC->quickroom, CC->quickroom.QRname);
- getuser(&CC->usersupp, CC->curr_user);
+ getroom(&CC->room, CC->room.QRname);
+ getuser(&CC->user, CC->curr_user);
- if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
+ if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d not here.\n", ERROR + NOT_HERE);
return;
}
- if (((CC->quickroom.QRflags & QR_VISDIR) == 0)
- && (CC->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != CC->quickroom.QRroomaide)) {
+ if (((CC->room.QRflags & QR_VISDIR) == 0)
+ && (CC->user.axlevel < 6)
+ && (CC->user.usernum != CC->room.QRroomaide)) {
cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
- cprintf("%d %s|%s/files/%s\n",
- LISTING_FOLLOWS, config.c_fqdn, BBSDIR, CC->quickroom.QRdirname);
-
- sprintf(buf, "ls %s/files/%s >%s 2> /dev/null",
- BBSDIR, CC->quickroom.QRdirname, CC->temp);
- system(buf);
-
- sprintf(buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
+ cprintf("%d %s|%s/%s\n",
+ LISTING_FOLLOWS,
+ config.c_fqdn,
+ ctdl_file_dir,
+ CC->room.QRdirname);
+
+ snprintf(buf, sizeof buf,
+ "ls %s/%s >%s 2>/dev/null",
+ ctdl_file_dir,
+ CC->room.QRdirname,
+ tempfilename);
+ system(buf);
+
+ snprintf(buf, sizeof buf,
+ "%s/%s/filedir",
+ ctdl_file_dir,
+ CC->room.QRdirname);
fd = fopen(buf, "r");
if (fd == NULL)
fd = fopen("/dev/null", "r");
- ls = fopen(CC->temp, "r");
+ ls = fopen(tempfilename, "r");
while (fgets(flnm, sizeof flnm, ls) != NULL) {
flnm[strlen(flnm) - 1] = 0;
if (strcasecmp(flnm, "filedir")) {
- sprintf(buf, "%s/files/%s/%s",
- BBSDIR, CC->quickroom.QRdirname, flnm);
+ snprintf(buf, sizeof buf,
+ "%s/%s/%s",
+ ctdl_file_dir,
+ CC->room.QRdirname,
+ flnm);
stat(buf, &statbuf);
- strcpy(comment, "");
+ safestrncpy(comment, "", sizeof comment);
fseek(fd, 0L, 0);
while ((fgets(buf, sizeof buf, fd) != NULL)
&& (strlen(comment) == 0)) {
&buf[strlen(flnm) + 1],
sizeof comment);
}
- cprintf("%s|%ld|%s\n", flnm, statbuf.st_size, comment);
+ cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment);
}
}
fclose(ls);
fclose(fd);
- unlink(CC->temp);
+ unlink(tempfilename);
cprintf("000\n");
}
{
if (CtdlAccessCheck(ac_room_aide)) return;
- /********
- if (is_noneditable(&CC->quickroom)) {
- cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
- return;
+ getroom(&CC->room, CC->room.QRname);
+ cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
+ CIT_OK,
+ CtdlCheckExpress(),
+
+ ((CC->room.QRflags & QR_MAILBOX) ?
+ &CC->room.QRname[11] : CC->room.QRname),
+
+ ((CC->room.QRflags & QR_PASSWORDED) ?
+ CC->room.QRpasswd : ""),
+
+ ((CC->room.QRflags & QR_DIRECTORY) ?
+ CC->room.QRdirname : ""),
+
+ CC->room.QRflags,
+ (int) CC->room.QRfloor,
+ (int) CC->room.QRorder,
+
+ CC->room.QRdefaultview,
+ CC->room.QRflags2
+ );
+}
+
+
+/*
+ * Back end function to rename a room.
+ * You can also specify which floor to move the room to, or specify -1 to
+ * keep the room on the same floor it was on.
+ *
+ * If you are renaming a mailbox room, you must supply the namespace prefix
+ * in *at least* the old name!
+ */
+int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
+ int old_floor = 0;
+ struct ctdlroom qrbuf;
+ struct ctdlroom qrtmp;
+ int ret = 0;
+ struct floor *fl;
+ struct floor flbuf;
+ long owner = 0L;
+ char actual_old_name[ROOMNAMELEN];
+
+ lprintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
+ old_name, new_name, new_floor);
+
+ if (new_floor >= 0) {
+ fl = cgetfloor(new_floor);
+ if ((fl->f_flags & F_INUSE) == 0) {
+ return(crr_invalid_floor);
+ }
+ }
+
+ begin_critical_section(S_ROOMS);
+
+ if ( (getroom(&qrtmp, new_name) == 0)
+ && (strcasecmp(new_name, old_name)) ) {
+ ret = crr_already_exists;
+ }
+
+ else if (getroom(&qrbuf, old_name) != 0) {
+ ret = crr_room_not_found;
}
- ************/
-
- getroom(&CC->quickroom, CC->quickroom.QRname);
- cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
- OK, CtdlCheckExpress(),
- CC->quickroom.QRname,
- ((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
- ((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
- CC->quickroom.QRflags,
- (int) CC->quickroom.QRfloor,
- (int) CC->quickroom.QRorder);
+
+ else if ( (CC->user.axlevel < 6) && (!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)) {
+ ret = crr_noneditable;
+ }
+
+ else {
+ /* Rename it */
+ safestrncpy(actual_old_name, qrbuf.QRname, sizeof actual_old_name);
+ if (qrbuf.QRflags & QR_MAILBOX) {
+ owner = atol(qrbuf.QRname);
+ }
+ if ( (owner > 0L) && (atol(new_name) == 0L) ) {
+ snprintf(qrbuf.QRname, sizeof(qrbuf.QRname),
+ "%010ld.%s", owner, new_name);
+ }
+ else {
+ safestrncpy(qrbuf.QRname, new_name,
+ sizeof(qrbuf.QRname));
+ }
+
+ /* Reject change of floor for baseroom/aideroom */
+ if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN) ||
+ !strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) {
+ new_floor = 0;
+ }
+
+ /* Take care of floor stuff */
+ old_floor = qrbuf.QRfloor;
+ if (new_floor < 0) {
+ new_floor = old_floor;
+ }
+ qrbuf.QRfloor = new_floor;
+ putroom(&qrbuf);
+
+ begin_critical_section(S_CONFIG);
+
+ /* If baseroom/aideroom name changes, update config */
+ if (!strncasecmp(old_name, config.c_baseroom, ROOMNAMELEN)) {
+ safestrncpy(config.c_baseroom, new_name, ROOMNAMELEN);
+ put_config();
+ }
+ if (!strncasecmp(old_name, config.c_aideroom, ROOMNAMELEN)) {
+ safestrncpy(config.c_aideroom, new_name, ROOMNAMELEN);
+ put_config();
+ }
+
+ end_critical_section(S_CONFIG);
+
+ /* If the room name changed, then there are now two room
+ * records, so we have to delete the old one.
+ */
+ if (strcasecmp(new_name, old_name)) {
+ b_deleteroom(actual_old_name);
+ }
+
+ ret = crr_ok;
+ }
+
+ end_critical_section(S_ROOMS);
+
+ /* Adjust the floor reference counts if necessary */
+ if (new_floor != old_floor) {
+ lgetfloor(&flbuf, old_floor);
+ --flbuf.f_ref_count;
+ lputfloor(&flbuf, old_floor);
+ lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
+ lgetfloor(&flbuf, new_floor);
+ ++flbuf.f_ref_count;
+ lputfloor(&flbuf, new_floor);
+ lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
+ }
+
+ /* ...and everybody say "YATTA!" */
+ return(ret);
}
*/
void cmd_setr(char *args)
{
- char buf[SIZ];
- struct floor *fl;
- struct floor flbuf;
- char old_name[ROOMNAMELEN];
- int old_floor;
+ char buf[256];
int new_order = 0;
- int ne = 0;
+ int r;
+ int new_floor;
+ char new_name[ROOMNAMELEN];
- if (CtdlAccessCheck(ac_room_aide)) return;
+ if (CtdlAccessCheck(ac_logged_in)) return;
- if (is_noneditable(&CC->quickroom)) {
- ne = 1;
+ if (num_parms(args) >= 6) {
+ new_floor = extract_int(args, 5);
+ } else {
+ new_floor = (-1); /* don't change the floor */
}
- /***
- cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
- return;
+ /* When is a new name more than just a new name? When the old name
+ * has a namespace prefix.
+ */
+ if (CC->room.QRflags & QR_MAILBOX) {
+ sprintf(new_name, "%010ld.", atol(CC->room.QRname) );
+ } else {
+ safestrncpy(new_name, "", sizeof new_name);
}
- ***/
+ extract_token(&new_name[strlen(new_name)], args, 0, '|', (sizeof new_name - strlen(new_name)));
+ r = CtdlRenameRoom(CC->room.QRname, new_name, new_floor);
- if (num_parms(args) >= 6) {
- fl = cgetfloor(extract_int(args, 5));
- if ((fl->f_flags & F_INUSE) == 0) {
- cprintf("%d Invalid floor number.\n",
- ERROR + INVALID_FLOOR_OPERATION);
- return;
- }
+ if (r == crr_room_not_found) {
+ cprintf("%d Internal error - room not found?\n", ERROR + INTERNAL_ERROR);
+ } else if (r == crr_already_exists) {
+ cprintf("%d '%s' already exists.\n",
+ ERROR + ALREADY_EXISTS, new_name);
+ } else if (r == crr_noneditable) {
+ cprintf("%d Cannot edit this room.\n", ERROR + NOT_HERE);
+ } else if (r == crr_invalid_floor) {
+ cprintf("%d Target floor does not exist.\n",
+ ERROR + INVALID_FLOOR_OPERATION);
+ } else if (r == crr_access_denied) {
+ cprintf("%d You do not have permission to edit '%s'\n",
+ ERROR + HIGHER_ACCESS_REQUIRED,
+ CC->room.QRname);
+ } else if (r != crr_ok) {
+ cprintf("%d Error: CtdlRenameRoom() returned %d\n",
+ ERROR + INTERNAL_ERROR, r);
+ }
+
+ if (r != crr_ok) {
+ return;
}
+
+ getroom(&CC->room, new_name);
+
+ /* Now we have to do a bunch of other stuff */
+
if (num_parms(args) >= 7) {
new_order = extract_int(args, 6);
if (new_order < 1)
if (new_order > 127)
new_order = 127;
}
- lgetroom(&CC->quickroom, CC->quickroom.QRname);
- /* Non-editable base rooms can't be renamed */
- strcpy(old_name, CC->quickroom.QRname);
- if (!ne) {
- extract(buf, args, 0);
- buf[ROOMNAMELEN] = 0;
- safestrncpy(CC->quickroom.QRname, buf,
- sizeof CC->quickroom.QRname);
- }
+ lgetroom(&CC->room, CC->room.QRname);
- extract(buf, args, 1);
- buf[10] = 0;
- safestrncpy(CC->quickroom.QRpasswd, buf, sizeof CC->quickroom.QRpasswd);
- extract(buf, args, 2);
+ /* Directory room */
+ extract_token(buf, args, 2, '|', sizeof buf);
buf[15] = 0;
- safestrncpy(CC->quickroom.QRdirname, buf,
- sizeof CC->quickroom.QRdirname);
- CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE);
- if (num_parms(args) >= 7)
- CC->quickroom.QRorder = (char) new_order;
+ safestrncpy(CC->room.QRdirname, buf,
+ sizeof CC->room.QRdirname);
+ /* Default view */
+ if (num_parms(args) >= 8) {
+ CC->room.QRdefaultview = extract_int(args, 7);
+ }
+
+ /* Second set of flags */
+ if (num_parms(args) >= 9) {
+ CC->room.QRflags2 = extract_int(args, 8);
+ }
+
+ /* Misc. flags */
+ CC->room.QRflags = (extract_int(args, 3) | QR_INUSE);
/* Clean up a client boo-boo: if the client set the room to
* guess-name or passworded, ensure that the private flag is
* also set.
*/
- if ((CC->quickroom.QRflags & QR_GUESSNAME)
- || (CC->quickroom.QRflags & QR_PASSWORDED))
- CC->quickroom.QRflags |= QR_PRIVATE;
-
- /* Kick everyone out if the client requested it (by changing the
- * room's generation number)
- */
- if (extract_int(args, 4)) {
- time(&CC->quickroom.QRgen);
+ if ((CC->room.QRflags & QR_GUESSNAME)
+ || (CC->room.QRflags & QR_PASSWORDED))
+ CC->room.QRflags |= QR_PRIVATE;
+
+ /* Some changes can't apply to BASEROOM */
+ if (!strncasecmp(CC->room.QRname, config.c_baseroom,
+ ROOMNAMELEN)) {
+ CC->room.QRorder = 0;
+ CC->room.QRpasswd[0] = '\0';
+ CC->room.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED &
+ QR_GUESSNAME & QR_PREFONLY & QR_MAILBOX);
+ CC->room.QRflags |= QR_PERMANENT;
+ } else {
+ /* March order (doesn't apply to AIDEROOM) */
+ if (num_parms(args) >= 7)
+ CC->room.QRorder = (char) new_order;
+ /* Room password */
+ extract_token(buf, args, 1, '|', sizeof buf);
+ buf[10] = 0;
+ safestrncpy(CC->room.QRpasswd, buf,
+ sizeof CC->room.QRpasswd);
+ /* Kick everyone out if the client requested it
+ * (by changing the room's generation number)
+ */
+ if (extract_int(args, 4)) {
+ time(&CC->room.QRgen);
+ }
}
- old_floor = CC->quickroom.QRfloor;
- if (num_parms(args) >= 6) {
- CC->quickroom.QRfloor = extract_int(args, 5);
+ /* Some changes can't apply to AIDEROOM */
+ if (!strncasecmp(CC->room.QRname, config.c_baseroom,
+ ROOMNAMELEN)) {
+ CC->room.QRorder = 0;
+ CC->room.QRflags &= ~QR_MAILBOX;
+ CC->room.QRflags |= QR_PERMANENT;
}
- /* Write the room record back to disk */
- lputroom(&CC->quickroom);
- /* If the room name changed, then there are now two room records,
- * so we have to delete the old one.
- */
- if (strcasecmp(CC->quickroom.QRname, old_name)) {
- b_deleteroom(old_name);
- }
- /* adjust the floor reference counts */
- lgetfloor(&flbuf, old_floor);
- --flbuf.f_ref_count;
- lputfloor(&flbuf, old_floor);
- lgetfloor(&flbuf, CC->quickroom.QRfloor);
- ++flbuf.f_ref_count;
- lputfloor(&flbuf, CC->quickroom.QRfloor);
-
- /* create a room directory if necessary */
- if (CC->quickroom.QRflags & QR_DIRECTORY) {
- sprintf(buf,
- "mkdir ./files/%s </dev/null >/dev/null 2>/dev/null",
- CC->quickroom.QRdirname);
- system(buf);
- }
- sprintf(buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
- aide_message(buf);
- cprintf("%d Ok\n", OK);
+ /* Write the room record back to disk */
+ lputroom(&CC->room);
+
+ /* Create a room directory if necessary */
+ if (CC->room.QRflags & QR_DIRECTORY) {
+ snprintf(buf, sizeof buf,"%s/%s",
+ ctdl_file_dir,
+ CC->room.QRdirname);
+ mkdir(buf, 0755);
+ }
+ snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
+ CC->room.QRname, CC->curr_user);
+ aide_message(buf, "Room modification Message");
+ cprintf("%d Ok\n", CIT_OK);
}
*/
void cmd_geta(void)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
if (CtdlAccessCheck(ac_logged_in)) return;
- if (is_noneditable(&CC->quickroom)) {
- cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
- return;
- }
- if (getuserbynumber(&usbuf, CC->quickroom.QRroomaide) == 0) {
- cprintf("%d %s\n", OK, usbuf.fullname);
+ if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) {
+ cprintf("%d %s\n", CIT_OK, usbuf.fullname);
} else {
- cprintf("%d \n", OK);
+ cprintf("%d \n", CIT_OK);
}
}
*/
void cmd_seta(char *new_ra)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
long newu;
char buf[SIZ];
int post_notice;
newu = usbuf.usernum;
}
- lgetroom(&CC->quickroom, CC->quickroom.QRname);
+ lgetroom(&CC->room, CC->room.QRname);
post_notice = 0;
- if (CC->quickroom.QRroomaide != newu) {
+ if (CC->room.QRroomaide != newu) {
post_notice = 1;
}
- CC->quickroom.QRroomaide = newu;
- lputroom(&CC->quickroom);
+ CC->room.QRroomaide = newu;
+ lputroom(&CC->room);
/*
* We have to post the change notice _after_ writing changes to
* the room table, otherwise it would deadlock!
*/
if (post_notice == 1) {
- sprintf(buf, "%s is now room aide for %s>\n",
- usbuf.fullname, CC->quickroom.QRname);
- aide_message(buf);
- }
- cprintf("%d Ok\n", OK);
-}
-
-/*
- * Generate an associated file name for a room
- */
-void assoc_file_name(char *buf, struct quickroom *qrbuf, char *prefix)
-{
- sprintf(buf, "./%s/%ld", prefix, qrbuf->QRnumber);
+ if (strlen(usbuf.fullname) > 0)
+ snprintf(buf, sizeof buf,
+ "%s is now the room aide for \"%s\".\n",
+ usbuf.fullname, CC->room.QRname);
+ else
+ snprintf(buf, sizeof buf,
+ "There is now no room aide for \"%s\".\n",
+ CC->room.QRname);
+ aide_message(buf, "Aide Room Modification");
+ }
+ cprintf("%d Ok\n", CIT_OK);
}
/*
char buf[SIZ];
FILE *info_fp;
- assoc_file_name(filename, &CC->quickroom, "info");
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_info_dir);
info_fp = fopen(filename, "r");
if (info_fp == NULL) {
- cprintf("%d No info file.\n", ERROR);
+ cprintf("%d No info file.\n", ERROR + FILE_NOT_FOUND);
return;
}
cprintf("%d Info:\n", LISTING_FOLLOWS);
fclose(info_fp);
}
+/*
+ * Asynchronously schedule a room for deletion. The room will appear
+ * deleted to the user(s), but it won't actually get purged from the
+ * database until THE DREADED AUTO-PURGER makes its next run.
+ */
+void schedule_room_for_deletion(struct ctdlroom *qrbuf)
+{
+ char old_name[ROOMNAMELEN];
+ static int seq = 0;
+
+ lprintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
+ qrbuf->QRname);
+
+ safestrncpy(old_name, qrbuf->QRname, sizeof old_name);
+
+ getroom(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,
+ * and qualify the room for purging.
+ */
+ snprintf(qrbuf->QRname, sizeof qrbuf->QRname, "9999999999.%08lx.%04d.%s",
+ time(NULL),
+ ++seq,
+ old_name
+ );
+ qrbuf->QRflags |= QR_MAILBOX;
+ time(&qrbuf->QRgen); /* Use a timestamp as the new generation number */
+
+ putroom(qrbuf);
+
+ b_deleteroom(old_name);
+}
+
+
+
/*
* Back end processing to delete a room and everything associated with it
+ * (This one is synchronous and should only get called by THE DREADED
+ * AUTO-PURGER in serv_expire.c. All user-facing code should call
+ * the asynchronous schedule_room_for_deletion() instead.)
*/
-void delete_room(struct quickroom *qrbuf)
+void delete_room(struct ctdlroom *qrbuf)
{
struct floor flbuf;
char filename[100];
+ /* TODO: filename magic? does this realy work? */
- lprintf(9, "Deleting room <%s>\n", qrbuf->QRname);
+ lprintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
/* Delete the info file */
- assoc_file_name(filename, qrbuf, "info");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
unlink(filename);
/* Delete the image file */
- assoc_file_name(filename, qrbuf, "images");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir);
unlink(filename);
/* Delete the room's network config file */
- assoc_file_name(filename, qrbuf, "netconfigs");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
unlink(filename);
/* Delete the messages in the room
- * (Careful: this opens an S_QUICKROOM critical section!)
+ * (Careful: this opens an S_ROOMS critical section!)
*/
- CtdlDeleteMessages(qrbuf->QRname, 0L, "");
+ CtdlDeleteMessages(qrbuf->QRname, NULL, 0, "");
/* Flag the room record as not in use */
lgetroom(qrbuf, qrbuf->QRname);
}
+
+/*
+ * Check access control for deleting a room
+ */
+int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
+
+ if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
+ return(0);
+ }
+
+ if (is_noneditable(qr)) {
+ return(0);
+ }
+
+ /*
+ * For mailboxes, check stuff
+ */
+ if (qr->QRflags & QR_MAILBOX) {
+
+ if (strlen(qr->QRname) < 12) return(0); /* bad name */
+
+ if (atol(qr->QRname) != CC->user.usernum) {
+ return(0); /* not my room */
+ }
+
+ /* Can't delete your Mail> room */
+ if (!strcasecmp(&qr->QRname[11], MAILROOM)) return(0);
+
+ /* Otherwise it's ok */
+ return(1);
+ }
+
+ /*
+ * For normal rooms, just check for aide or room aide status.
+ */
+ return(is_room_aide());
+}
+
/*
* aide command: kill the current room
*/
void cmd_kill(char *argbuf)
{
- char aaa[100];
char deleted_room_name[ROOMNAMELEN];
+ char msg[SIZ];
int kill_ok;
kill_ok = extract_int(argbuf, 0);
- if (CtdlAccessCheck(ac_room_aide)) return;
-
- if (is_noneditable(&CC->quickroom)) {
- cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
+ if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->room) == 0) {
+ cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
return;
}
if (kill_ok) {
- strcpy(deleted_room_name, CC->quickroom.QRname);
- delete_room(&CC->quickroom); /* Do the dirty work */
- usergoto(BASEROOM, 0, NULL, NULL); /* Return to the Lobby */
+ if (CC->room.QRflags & QR_MAILBOX) {
+ safestrncpy(deleted_room_name, &CC->room.QRname[11], sizeof deleted_room_name);
+ }
+ else {
+ safestrncpy(deleted_room_name, CC->room.QRname, sizeof deleted_room_name);
+ }
+
+ /* Do the dirty work */
+ schedule_room_for_deletion(&CC->room);
+
+ /* Return to the Lobby */
+ usergoto(config.c_baseroom, 0, 0, NULL, NULL);
/* tell the world what we did */
- sprintf(aaa, "%s> killed by %s\n",
- deleted_room_name, CC->curr_user);
- aide_message(aaa);
- cprintf("%d '%s' deleted.\n", OK, deleted_room_name);
+ snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
+ deleted_room_name, CC->curr_user);
+ aide_message(msg, "Room Purger Message");
+ cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
} else {
- cprintf("%d ok to delete.\n", OK);
+ 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, 4=mailbox
+ * Room types: 0=public, 1=guessname, 2=passworded, 3=inv-only,
+ * 4=mailbox, 5=mailbox, but caller supplies namespace
*/
unsigned create_room(char *new_room_name,
int new_room_type,
char *new_room_pass,
- int new_room_floor)
+ int new_room_floor,
+ int really_create,
+ int avoid_access,
+ int new_room_view)
{
- struct quickroom qrbuf;
+ struct ctdlroom qrbuf;
struct floor flbuf;
struct visit vbuf;
- lprintf(9, "create_room(%s)\n", new_room_name);
+ lprintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n",
+ new_room_name, new_room_type, new_room_view);
+
if (getroom(&qrbuf, new_room_name) == 0) {
- lprintf(9, "%s already exists.\n", new_room_name);
- return (0); /* already exists */
+ lprintf(CTDL_DEBUG, "%s already exists.\n", new_room_name);
+ return(0);
}
- memset(&qrbuf, 0, sizeof(struct quickroom));
- safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
+ memset(&qrbuf, 0, sizeof(struct ctdlroom));
safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd);
qrbuf.QRflags = QR_INUSE;
- qrbuf.QRnumber = get_new_room_number();
if (new_room_type > 0)
qrbuf.QRflags = (qrbuf.QRflags | QR_PRIVATE);
if (new_room_type == 1)
qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
if (new_room_type == 2)
qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
- if (new_room_type == 4)
+ if ( (new_room_type == 4) || (new_room_type == 5) )
qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
+ /* If the user is requesting a personal room, set up the room
+ * name accordingly (prepend the user number)
+ */
+ if (new_room_type == 4) {
+ MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
+ }
+ 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.
*/
if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) {
- qrbuf.QRroomaide = CC->usersupp.usernum;
+ qrbuf.QRroomaide = CC->user.usernum;
} else {
qrbuf.QRroomaide = (-1L);
}
+ /*
+ * If the caller is only interested in testing whether this will work,
+ * return now without creating the room.
+ */
+ if (!really_create) return (qrbuf.QRflags);
+
+ qrbuf.QRnumber = get_new_room_number();
qrbuf.QRhighest = 0L; /* No messages in this room yet */
time(&qrbuf.QRgen); /* Use a timestamp as the generation number */
qrbuf.QRfloor = new_room_floor;
+ qrbuf.QRdefaultview = new_room_view;
/* save what we just did... */
putroom(&qrbuf);
flbuf.f_ref_count = flbuf.f_ref_count + 1;
lputfloor(&flbuf, (int) qrbuf.QRfloor);
- /* be sure not to kick the creator out of the room! */
- lgetuser(&CC->usersupp, CC->curr_user);
- CtdlGetRelationship(&vbuf, &CC->usersupp, &qrbuf);
- vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
- vbuf.v_flags = vbuf.v_flags | V_ACCESS;
- CtdlSetRelationship(&vbuf, &CC->usersupp, &qrbuf);
- lputuser(&CC->usersupp);
+ /* Grant the creator access to the room unless the avoid_access
+ * parameter was specified.
+ */
+ if ( (CC->logged_in) && (avoid_access == 0) ) {
+ CtdlGetRelationship(&vbuf, &CC->user, &qrbuf);
+ vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
+ vbuf.v_flags = vbuf.v_flags | V_ACCESS;
+ CtdlSetRelationship(&vbuf, &CC->user, &qrbuf);
+ }
/* resume our happy day */
return (qrbuf.QRflags);
void cmd_cre8(char *args)
{
int cre8_ok;
- char new_room_name[SIZ];
+ char new_room_name[ROOMNAMELEN];
int new_room_type;
- char new_room_pass[SIZ];
+ char new_room_pass[32];
int new_room_floor;
- char aaa[SIZ];
+ int new_room_view;
+ char *notification_message = NULL;
unsigned newflags;
- struct quickroom qrbuf;
struct floor *fl;
+ int avoid_access = 0;
cre8_ok = extract_int(args, 0);
- extract(new_room_name, args, 1);
+ extract_token(new_room_name, args, 1, '|', sizeof new_room_name);
new_room_name[ROOMNAMELEN - 1] = 0;
new_room_type = extract_int(args, 2);
- extract(new_room_pass, args, 3);
+ extract_token(new_room_pass, args, 3, '|', sizeof new_room_pass);
+ avoid_access = extract_int(args, 5);
+ new_room_view = extract_int(args, 6);
new_room_pass[9] = 0;
new_room_floor = 0;
if ((strlen(new_room_name) == 0) && (cre8_ok == 1)) {
- cprintf("%d Invalid room name.\n", ERROR);
+ cprintf("%d Invalid room name.\n", ERROR + ILLEGAL_VALUE);
return;
}
if (num_parms(args) >= 5) {
fl = cgetfloor(extract_int(args, 4));
- if ((fl->f_flags & F_INUSE) == 0) {
+ if (fl == NULL) {
+ cprintf("%d Invalid floor number.\n",
+ ERROR + INVALID_FLOOR_OPERATION);
+ return;
+ }
+ else if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
if (CtdlAccessCheck(ac_logged_in)) return;
- if (CC->usersupp.axlevel < config.c_createax) {
+ if (CC->user.axlevel < config.c_createax || CC->internal_pgm) {
cprintf("%d You need higher access to create rooms.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
if ((strlen(new_room_name) == 0) && (cre8_ok == 0)) {
- cprintf("%d Ok to create rooms.\n", OK);
+ cprintf("%d Ok to create rooms.\n", CIT_OK);
return;
}
- if ((new_room_type < 0) || (new_room_type > 4)) {
- cprintf("%d Invalid room type.\n", ERROR);
+ if ((new_room_type < 0) || (new_room_type > 5)) {
+ cprintf("%d Invalid room type.\n", ERROR + ILLEGAL_VALUE);
return;
}
- /* If the user is requesting a personal room, set up the room
- * name accordingly (prepend the user number)
- */
- if (new_room_type == 4) {
- sprintf(aaa, "%010ld.%s",
- CC->usersupp.usernum, new_room_name);
- strcpy(new_room_name, aaa);
+ if (new_room_type == 5) {
+ if (CC->user.axlevel < 6) {
+ cprintf("%d Higher access required\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ return;
+ }
}
/* Check to make sure the requested room name doesn't already exist */
- if (getroom(&qrbuf, new_room_name) == 0) {
+ newflags = create_room(new_room_name,
+ new_room_type, new_room_pass, new_room_floor,
+ 0, avoid_access, new_room_view);
+ if (newflags == 0) {
cprintf("%d '%s' already exists.\n",
- ERROR + ALREADY_EXISTS, qrbuf.QRname);
+ ERROR + ALREADY_EXISTS, new_room_name);
return;
}
if (cre8_ok == 0) {
- cprintf("%d OK to create '%s'\n", OK, new_room_name);
+ cprintf("%d OK to create '%s'\n", CIT_OK, new_room_name);
return;
}
+ /* If we reach this point, the room needs to be created. */
+
newflags = create_room(new_room_name,
- new_room_type, new_room_pass, new_room_floor);
+ new_room_type, new_room_pass, new_room_floor, 1, 0,
+ new_room_view);
/* post a message in Aide> describing the new room */
- safestrncpy(aaa, new_room_name, sizeof aaa);
- strcat(aaa, "> created by ");
- strcat(aaa, CC->usersupp.fullname);
- if (newflags & QR_MAILBOX)
- strcat(aaa, " [personal]");
- else if (newflags & QR_PRIVATE)
- strcat(aaa, " [private]");
- if (newflags & QR_GUESSNAME)
- strcat(aaa, "[guessname] ");
- if (newflags & QR_PASSWORDED) {
- strcat(aaa, "\n Password: ");
- strcat(aaa, new_room_pass);
- }
- strcat(aaa, "\n");
- aide_message(aaa);
-
- cprintf("%d '%s' has been created.\n", OK, qrbuf.QRname);
+ notification_message = malloc(1024);
+ snprintf(notification_message, 1024,
+ "A new room called \"%s\" has been created by %s%s%s%s%s%s\n",
+ new_room_name,
+ CC->user.fullname,
+ ((newflags & QR_MAILBOX) ? " [personal]" : ""),
+ ((newflags & QR_PRIVATE) ? " [private]" : ""),
+ ((newflags & QR_GUESSNAME) ? " [hidden]" : ""),
+ ((newflags & QR_PASSWORDED) ? " Password: " : ""),
+ ((newflags & QR_PASSWORDED) ? new_room_pass : "")
+ );
+ aide_message(notification_message, "Room Creation Message");
+ free(notification_message);
+
+ cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
}
char infofilename[SIZ];
char buf[SIZ];
+ unbuffer_output();
+
if (CtdlAccessCheck(ac_room_aide)) return;
if (atoi(ok) == 0) {
- cprintf("%d Ok.\n", OK);
+ cprintf("%d Ok.\n", CIT_OK);
return;
}
- assoc_file_name(infofilename, &CC->quickroom, "info");
- lprintf(9, "opening\n");
+ assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
+ lprintf(CTDL_DEBUG, "opening\n");
fp = fopen(infofilename, "w");
- lprintf(9, "checking\n");
+ lprintf(CTDL_DEBUG, "checking\n");
if (fp == NULL) {
cprintf("%d Cannot open %s: %s\n",
ERROR + INTERNAL_ERROR, infofilename, strerror(errno));
cprintf("%d Send info...\n", SEND_LISTING);
do {
- client_gets(buf);
+ client_getln(buf, sizeof buf);
if (strcmp(buf, "000"))
fprintf(fp, "%s\n", buf);
} while (strcmp(buf, "000"));
fclose(fp);
/* now update the room index so people will see our new info */
- lgetroom(&CC->quickroom, CC->quickroom.QRname); /* lock so no one steps on us */
- CC->quickroom.QRinfo = CC->quickroom.QRhighest + 1L;
- lputroom(&CC->quickroom);
+ lgetroom(&CC->room, CC->room.QRname); /* lock so no one steps on us */
+ CC->room.QRinfo = CC->room.QRhighest + 1L;
+ lputroom(&CC->room);
}
*/
void cmd_cflr(char *argbuf)
{
- char new_floor_name[SIZ];
+ char new_floor_name[256];
struct floor flbuf;
int cflr_ok;
int free_slot = (-1);
int a;
- extract(new_floor_name, argbuf, 0);
+ extract_token(new_floor_name, argbuf, 0, '|', sizeof new_floor_name);
cflr_ok = extract_int(argbuf, 1);
-
if (CtdlAccessCheck(ac_aide)) return;
+ if (strlen(new_floor_name) == 0) {
+ cprintf("%d Blank floor name not allowed.\n",
+ ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
for (a = 0; a < MAXFLOORS; ++a) {
getfloor(&flbuf, a);
return;
}
if (cflr_ok == 0) {
- cprintf("%d ok to create...\n", OK);
+ cprintf("%d ok to create...\n", CIT_OK);
return;
}
lgetfloor(&flbuf, free_slot);
flbuf.f_ref_count = 0;
safestrncpy(flbuf.f_name, new_floor_name, sizeof flbuf.f_name);
lputfloor(&flbuf, free_slot);
- cprintf("%d %d\n", OK, free_slot);
+ cprintf("%d %d\n", CIT_OK, free_slot);
}
delete_ok = 0;
} else {
if (kflr_ok == 1) {
- cprintf("%d Ok\n", OK);
+ cprintf("%d Ok\n", CIT_OK);
} else {
- cprintf("%d Ok to delete...\n", OK);
+ cprintf("%d Ok to delete...\n", CIT_OK);
}
}
np = num_parms(argbuf);
if (np < 1) {
- cprintf("%d Usage error.\n", ERROR);
+ cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
return;
}
return;
}
if (np >= 2)
- extract(flbuf.f_name, argbuf, 1);
+ extract_token(flbuf.f_name, argbuf, 1, '|', sizeof flbuf.f_name);
lputfloor(&flbuf, floor_num);
- cprintf("%d Ok\n", OK);
+ cprintf("%d Ok\n", CIT_OK);
}
projects / citadel.git / blobdiff