/*
- * $Id$
- *
* Server functions which perform operations on room objects.
*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
+#include <ctype.h>
#include <string.h>
+#include <dirent.h> /* for cmd_rdir to read contents of the directory */
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#include <limits.h>
#include <errno.h>
#include "citadel.h"
+#include <libcitadel.h>
#include "server.h"
-#include "dynloader.h"
#include "database.h"
#include "config.h"
#include "room_ops.h"
#include "sysdep_decls.h"
#include "support.h"
-#include "user_ops.h"
#include "msgbase.h"
#include "citserver.h"
#include "control.h"
-#include "tools.h"
+#include "citadel_dirs.h"
+#include "threads.h"
+
+#include "ctdl_module.h"
+#include "user_ops.h"
struct floor *floorcache[MAXFLOORS];
/*
- * Generic routine for determining user access to rooms
+ * Retrieve access control information for any user/room pair
*/
-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;
+ visit vbuf;
/* for internal programs, always do everything */
if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) {
- return (UA_KNOWN | UA_GOTOALLOWED);
+ retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED);
+ vbuf.v_view = 0;
+ goto SKIP_EVERYTHING;
}
/* Locate any applicable user/room relationships */
/* Force the properties of the Aide room */
if (!strcasecmp(roombuf->QRname, config.c_aideroom)) {
- if (userbuf->axlevel >= 6) {
- retval = UA_KNOWN | UA_GOTOALLOWED;
+ 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;
}
}
}
}
- /* For mailbox rooms, also check the generation number matchups */
+ /* For mailbox rooms, also check the namespace */
+ /* Also, mailbox owners can delete their messages */
if (roombuf->QRflags & QR_MAILBOX) {
if (userbuf->usernum == atol(roombuf->QRname)) {
- retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
}
/* An explicit match means the user belongs in this room */
if (vbuf.v_flags & V_ACCESS) {
- retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED;
+ }
+ }
+
+ /* For non-mailbox rooms... */
+ else {
+
+ /* User is allowed to post in the room unless:
+ * - User is not validated
+ * - User has no net privileges and it is a shared network room
+ * - It is a read-only room
+ */
+ int post_allowed = 1;
+ 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;
}
+
+ /* 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 (retval & UA_POSTALLOWED) {
+ retval = retval | UA_DELETEALLOWED;
+ }
+ }
+
}
/* Check to see if the user has forgotten this room */
if ( ( ((roombuf->QRflags & QR_PRIVATE) == 0)
&& ((roombuf->QRflags & QR_MAILBOX) == 0) )
|| ( (roombuf->QRflags & QR_MAILBOX)
- && (atol(roombuf->QRname) == CC->usersupp.usernum))) {
+ && (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;
+ retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED & ~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;
+ retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
}
else {
- retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED;
}
}
- /* On some systems, Aides can gain access to mailboxes as well */
- if ( (config.c_aide_mailboxes)
- && (userbuf->axlevel >= 6)
+ /* Aides can gain access to mailboxes as well, but they don't show
+ * by default.
+ */
+ if ( (userbuf->axlevel >= AxAideU)
&& (roombuf->QRflags & QR_MAILBOX) ) {
- retval = retval | UA_GOTOALLOWED;
+ retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED;
+ }
+
+ /* Aides and Room Aides have admin privileges */
+ if ( (userbuf->axlevel >= AxAideU)
+ || (userbuf->usernum == roombuf->QRroomaide)
+ ) {
+ retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED | UA_POSTALLOWED;
}
NEWMSG: /* By the way, we also check for the presence of new messages */
- if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
+ if (is_msg_in_sequence_set(vbuf.v_seen, roombuf->QRhighest) == 0) {
retval = retval | UA_HASNEWMSGS;
}
if (roombuf->QRflags2 & QR2_SYSTEM) {
retval = retval & ~UA_KNOWN;
}
- return (retval);
+
+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) {
/*
- * getroom() - retrieve room data from disk
+ * CtdlGetRoom() - retrieve room data from disk
*/
-int getroom(struct quickroom *qrbuf, char *room_name)
+int CtdlGetRoom(struct ctdlroom *qrbuf, char *room_name)
{
struct cdbdata *cdbqr;
char lowercase_name[ROOMNAMELEN];
char personal_lowercase_name[ROOMNAMELEN];
- int a;
+ char *dptr, *sptr, *eptr;
- for (a = 0; room_name[a] && a < sizeof lowercase_name - 1; ++a) {
- lowercase_name[a] = tolower(room_name[a]);
+ dptr = lowercase_name;
+ sptr = room_name;
+ eptr = (dptr + (sizeof lowercase_name - 1));
+ while (!IsEmptyStr(sptr) && (dptr < eptr)){
+ *dptr = tolower(*sptr);
+ sptr++; dptr++;
}
- lowercase_name[a] = 0;
+ *dptr = '\0';
- memset(qrbuf, 0, sizeof(struct 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) {
snprintf(personal_lowercase_name,
sizeof personal_lowercase_name, "%010ld.%s",
- CC->usersupp.usernum, lowercase_name);
- cdbqr = cdb_fetch(CDB_QUICKROOM,
+ 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)
+ * CtdlGetRoomLock() - same as getroom() but locks the record (if supported)
*/
-int lgetroom(struct quickroom *qrbuf, char *room_name)
+int CtdlGetRoomLock(struct ctdlroom *qrbuf, char *room_name)
{
register int retval;
- retval = getroom(qrbuf, room_name);
- if (retval == 0) begin_critical_section(S_QUICKROOM);
+ retval = CtdlGetRoom(qrbuf, room_name);
+ 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;
+ char *aptr, *bptr;
+ long len;
- for (a = 0; a <= strlen(room_name); ++a) {
- lowercase_name[a] = tolower(room_name[a]);
+ aptr = room_name;
+ bptr = lowercase_name;
+ while (!IsEmptyStr(aptr))
+ {
+ *bptr = tolower(*aptr);
+ aptr++;
+ bptr++;
}
+ *bptr='\0';
+ len = bptr - lowercase_name;
if (qrbuf == NULL) {
- cdb_delete(CDB_QUICKROOM,
- lowercase_name, strlen(lowercase_name));
+ cdb_delete(CDB_ROOMS,
+ lowercase_name, len);
} else {
time(&qrbuf->QRmtime);
- cdb_store(CDB_QUICKROOM,
- lowercase_name, strlen(lowercase_name),
- qrbuf, sizeof(struct quickroom));
+ cdb_store(CDB_ROOMS,
+ lowercase_name, len,
+ qrbuf, sizeof(struct ctdlroom));
}
}
/*
- * putroom() - store room data to disk
+ * CtdlPutRoom() - store room data to disk
*/
-void putroom(struct quickroom *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 quickroom *qrbuf)
+void CtdlPutRoomLock(struct ctdlroom *qrbuf)
{
- putroom(qrbuf);
- end_critical_section(S_QUICKROOM);
+ 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;
+}
+
+
+
/*
- * getfloor() - retrieve floor data from disk
+ * CtdlGetFloorByNameLock() - retrieve floor number for given floor and lock the floor list.
*/
-void getfloor(struct floor *flbuf, int floor_num)
+int CtdlGetFloorByNameLock(const char *floor_name)
+{
+ begin_critical_section(S_FLOORTAB);
+ return CtdlGetFloorByName(floor_name);
+}
+
+
+
+/*
+ * CtdlGetAvailableFloor() - Return number of first unused floor
+ * return < 0 if none available
+ */
+int CtdlGetAvailableFloor(void)
+{
+ int a;
+ struct floor *flbuf = NULL;
+
+ for (a = 0; a < MAXFLOORS; a++) {
+ flbuf = CtdlGetCachedFloor(a);
+
+ /* check to see if it already exists */
+ if ((flbuf->f_flags & F_INUSE) == 0) {
+ return a;
+ }
+ }
+ return -1;
+}
+
+
+/*
+ * CtdlGetFloor() - retrieve floor data from disk
+ */
+void CtdlGetFloor(struct floor *flbuf, int floor_num)
{
struct cdbdata *cdbfl;
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;
}
}
/*
- * 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;
+ 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));
+ CtdlGetFloor(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]);
/*
- * 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)
{
- 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]);
- floorcache[floor_num] = NULL;
+ 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));
}
+
/*
- * 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 quickroom *EachRoom, void *out_data),
+void CtdlForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
void *in_data)
{
- struct quickroom qrbuf;
+ struct ctdlroom qrbuf;
struct cdbdata *cdbqr;
- 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)
/*
* delete_msglist() - delete room message pointers
*/
-void delete_msglist(struct quickroom *whichroom)
+void delete_msglist(struct ctdlroom *whichroom)
{
struct cdbdata *cdbml;
+/*
+ * Message pointer compare function for sort_msglist()
+ */
+int sort_msglist_cmp(const void *m1, const void *m2) {
+ if ((*(const long *)m1) > (*(const long *)m2)) return(1);
+ if ((*(const long *)m1) < (*(const long *)m2)) return(-1);
+ return(0);
+}
+
/*
* sort message pointers
*/
int sort_msglist(long listptrs[], int oldcount)
{
- int a, b;
- long hold1, hold2;
int numitems;
numitems = oldcount;
- if (numitems < 2)
+ if (numitems < 2) {
return (oldcount);
+ }
/* do the sort */
- for (a = numitems - 2; a >= 0; --a) {
- for (b = 0; b <= a; ++b) {
- if (listptrs[b] > (listptrs[b + 1])) {
- hold1 = listptrs[b];
- hold2 = listptrs[b + 1];
- listptrs[b] = hold2;
- listptrs[b + 1] = hold1;
- }
- }
- }
+ qsort(listptrs, numitems, sizeof(long), sort_msglist_cmp);
/* and yank any nulls */
while ((numitems > 0) && (listptrs[0] == 0L)) {
- memcpy(&listptrs[0], &listptrs[1],
+ memmove(&listptrs[0], &listptrs[1],
(sizeof(long) * (numitems - 1)));
--numitems;
}
/*
* Determine whether a given room is non-editable.
*/
-int is_noneditable(struct quickroom *qrbuf)
+int CtdlIsNonEditable(struct ctdlroom *qrbuf)
{
/* Mail> rooms are non-editable */
/*
* 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 my own mailbox rooms, chop off the owner prefix */
if ( (qrbuf->QRflags & QR_MAILBOX)
- && (atol(qrbuf->QRname) == CC->usersupp.usernum) ) {
- strcpy(truncated_roomname, qrbuf->QRname);
- strcpy(truncated_roomname, &truncated_roomname[11]);
+ && (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|%d\n",
+ cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n",
qrbuf->QRflags,
(int) qrbuf->QRfloor,
(int) qrbuf->QRorder,
- (int) qrbuf->QRflags2
+ (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)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, 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");
}
/*
* 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)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, 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");
}
-void cmd_lprm_backend(struct quickroom *qrbuf, void *data)
+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);
+ list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
}
void cmd_lprm(char *argbuf)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS);
- ForEachRoom(cmd_lprm_backend, &FloorBeingSearched);
+ CtdlForEachRoom(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)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, 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");
}
/*
* 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)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, 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");
}
/*
* 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)
{
int FloorBeingSearched = (-1);
- if (strlen(argbuf) > 0)
+ if (!IsEmptyStr(argbuf))
FloorBeingSearched = extract_int(argbuf, 0);
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuser(&CC->usersupp, 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;
int new_messages = 0;
+ int old_messages = 0;
int total_messages = 0;
int info = 0;
int rmailflag;
int raideflag;
int newmailcount = 0;
- struct visit vbuf;
+ visit vbuf;
char truncated_roomname[ROOMNAMELEN];
struct cdbdata *cdbfr;
long *msglist = NULL;
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 quickroom record into CC->quickroom, so
+ * it has already copied the room record into CC->room, so
* we can skip the extra database fetch.
*/
if (where != NULL) {
- strcpy(CC->quickroom.QRname, where);
- getroom(&CC->quickroom, where);
+ safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname);
+ CtdlGetRoom(&CC->room, where);
}
/* Take care of all the formalities. */
- begin_critical_section(S_USERSUPP);
- 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, or if the
* caller specified that we're only entering this room transiently.
*/
- if ((strcasecmp(CC->quickroom.QRname, config.c_logpages))
+ 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);
- end_critical_section(S_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 */
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; /* CtdlUserGoto() 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 (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
- ++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 >= AxAideU))
raideflag = 1;
else
raideflag = 0;
- strcpy(truncated_roomname, CC->quickroom.QRname);
- if ( (CC->quickroom.QRflags & QR_MAILBOX)
- && (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
- 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);
+ CtdlLogPrintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
+ CC->room.QRname,
+ new_messages, total_messages
+ );
+
+ 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\n",
+ if (display_result) {
+ cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%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,
- vbuf.v_view);
+ (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,
+ (int)CC->room.QRflags2
+ );
+ }
+}
+
+
+/*
+ * 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, "_DRAFTS_")) {
+ safestrncpy(towhere, USERDRAFTROOM, 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);
+ extract_token(towhere, gargs, 0, '|', sizeof towhere);
+ extract_token(password, gargs, 1, '|', sizeof password);
transiently = extract_int(gargs, 2);
- getuser(&CC->usersupp, CC->curr_user);
-
- if (!strcasecmp(towhere, "_BASEROOM_"))
- strcpy(towhere, config.c_baseroom);
-
- if (!strcasecmp(towhere, "_MAIL_"))
- strcpy(towhere, MAILROOM);
-
- if (!strcasecmp(towhere, "_BITBUCKET_"))
- strcpy(towhere, config.c_twitroom);
+ 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,
- &CC->usersupp, towhere);
- c = getroom(&QRscratch, augmented_roomname);
+ CtdlMailboxName(augmented_roomname, sizeof augmented_roomname,
+ &CC->user, towhere);
+ c = CtdlGetRoom(&QRscratch, augmented_roomname);
if (c == 0)
- strcpy(towhere, augmented_roomname);
+ safestrncpy(towhere, augmented_roomname, sizeof towhere);
}
/* And if the room was found... */
/* Let internal programs go directly to any room. */
if (CC->internal_pgm) {
- memcpy(&CC->quickroom, &QRscratch,
- sizeof(struct quickroom));
- usergoto(NULL, 1, transiently, NULL, NULL);
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ CtdlUserGoto(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 (ok == 1) {
if ((QRscratch.QRflags & QR_MAILBOX) &&
((ra & UA_GOTOALLOWED))) {
- memcpy(&CC->quickroom, &QRscratch,
- sizeof(struct quickroom));
- usergoto(NULL, 1, transiently, NULL, NULL);
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ CtdlUserGoto(NULL, 1, transiently, NULL, NULL);
return;
} else if ((QRscratch.QRflags & QR_PASSWORDED) &&
((ra & UA_KNOWN) == 0) &&
(strcasecmp(QRscratch.QRpasswd, password)) &&
- (CC->usersupp.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->usersupp.axlevel < 6)
+ (CC->user.axlevel < AxAideU)
) {
- lprintf(9, "Failed to acquire private room\n");
- goto NOPE;
+ CtdlLogPrintf(CTDL_DEBUG, "Failed to acquire private room\n");
} else {
- memcpy(&CC->quickroom, &QRscratch,
- sizeof(struct quickroom));
- usergoto(NULL, 1, transiently, NULL, NULL);
+ memcpy(&CC->room, &QRscratch,
+ sizeof(struct ctdlroom));
+ CtdlUserGoto(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)
+void cmd_whok(char *cmdbuf)
{
- struct usersupp temp;
+ struct ctdluser temp;
struct cdbdata *cdbus;
-
- getuser(&CC->usersupp, CC->curr_user);
-
- /*
- * This command is only allowed by aides, room aides,
- * and room namespace owners
- */
- if (is_room_aide()
- || (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
- /* access granted */
- }
- else {
- /* access denied */
- cprintf("%d Higher access or room ownership required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
+ int ra;
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);
}
/*
* RDIR command for room directory
*/
-void cmd_rdir(void)
+void cmd_rdir(char *cmdbuf)
{
- char buf[SIZ];
- char flnm[SIZ];
- char comment[SIZ];
- FILE *ls, *fd;
+ char buf[256];
+ char comment[256];
+ FILE *fd;
struct stat statbuf;
-
+ DIR *filedir = NULL;
+ struct dirent *filedir_entry;
+ int d_namelen;
+ char buf2[SIZ];
+ char mimebuf[64];
+ long len;
+
if (CtdlAccessCheck(ac_logged_in)) return;
- getroom(&CC->quickroom, CC->quickroom.QRname);
- getuser(&CC->usersupp, CC->curr_user);
+ CtdlGetRoom(&CC->room, CC->room.QRname);
+ CtdlGetUser(&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 < AxAideU)
+ && (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);
-
- snprintf(buf, sizeof buf, "ls %s/files/%s >%s 2> /dev/null",
- BBSDIR, CC->quickroom.QRdirname, CC->temp);
- system(buf);
- snprintf(buf, sizeof buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
+ snprintf(buf, sizeof buf, "%s/%s", ctdl_file_dir, CC->room.QRdirname);
+ filedir = opendir (buf);
+
+ if (filedir == NULL) {
+ cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED);
+ return;
+ }
+ cprintf("%d %s|%s/%s\n", LISTING_FOLLOWS, config.c_fqdn, ctdl_file_dir, CC->room.QRdirname);
+
+ snprintf(buf, sizeof buf, "%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");
- while (fgets(flnm, sizeof flnm, ls) != NULL) {
- flnm[strlen(flnm) - 1] = 0;
- if (strcasecmp(flnm, "filedir")) {
- snprintf(buf, sizeof buf, "%s/files/%s/%s",
- BBSDIR, CC->quickroom.QRdirname, flnm);
- stat(buf, &statbuf);
- strcpy(comment, "");
- fseek(fd, 0L, 0);
- while ((fgets(buf, sizeof buf, fd) != NULL)
- && (strlen(comment) == 0)) {
+ while ((filedir_entry = readdir(filedir)))
+ {
+ if (strcasecmp(filedir_entry->d_name, "filedir") && filedir_entry->d_name[0] != '.')
+ {
+#ifdef _DIRENT_HAVE_D_NAMELEN
+ d_namelen = filedir_entry->d_namelen;
+#else
+ d_namelen = strlen(filedir_entry->d_name);
+#endif
+ snprintf(buf, sizeof buf, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, filedir_entry->d_name);
+ stat(buf, &statbuf); /* stat the file */
+ if (!(statbuf.st_mode & S_IFREG))
+ {
+ 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);
+ fseek(fd, 0L, 0); /* rewind descriptions file */
+ /* Get the description from the descriptions file */
+ while ((fgets(buf, sizeof buf, fd) != NULL) && (IsEmptyStr(comment)))
+ {
buf[strlen(buf) - 1] = 0;
- if ((!strncasecmp(buf, flnm, strlen(flnm)))
- && (buf[strlen(flnm)] == ' '))
- safestrncpy(comment,
- &buf[strlen(flnm) + 1],
- sizeof comment);
+ if ((!strncasecmp(buf, filedir_entry->d_name, d_namelen)) && (buf[d_namelen] == ' '))
+ safestrncpy(comment, &buf[d_namelen + 1], sizeof comment);
}
- cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment);
+ len = extract_token (mimebuf, comment, 0,' ', 64);
+ if ((len <0) || strchr(mimebuf, '/') == NULL)
+ {
+ snprintf (mimebuf, 64, "application/octetstream");
+ len = 0;
+ }
+ cprintf("%s|%ld|%s|%s\n",
+ filedir_entry->d_name,
+ (long)statbuf.st_size,
+ mimebuf,
+ &comment[len]);
}
}
- fclose(ls);
fclose(fd);
- unlink(CC->temp);
-
+ closedir(filedir);
+
cprintf("000\n");
}
/*
* get room parameters (aide or room aide command)
*/
-void cmd_getr(void)
+void cmd_getr(char *cmdbuf)
{
if (CtdlAccessCheck(ac_room_aide)) return;
- getroom(&CC->quickroom, CC->quickroom.QRname);
+ CtdlGetRoom(&CC->room, CC->room.QRname);
cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
CIT_OK,
CtdlCheckExpress(),
- ((CC->quickroom.QRflags & QR_MAILBOX) ?
- &CC->quickroom.QRname[11] : CC->quickroom.QRname),
+ ((CC->room.QRflags & QR_MAILBOX) ?
+ &CC->room.QRname[11] : CC->room.QRname),
- ((CC->quickroom.QRflags & QR_PASSWORDED) ?
- CC->quickroom.QRpasswd : ""),
+ ((CC->room.QRflags & QR_PASSWORDED) ?
+ CC->room.QRpasswd : ""),
- ((CC->quickroom.QRflags & QR_DIRECTORY) ?
- CC->quickroom.QRdirname : ""),
+ ((CC->room.QRflags & QR_DIRECTORY) ?
+ CC->room.QRdirname : ""),
- CC->quickroom.QRflags,
- (int) CC->quickroom.QRfloor,
- (int) CC->quickroom.QRorder,
+ CC->room.QRflags,
+ (int) CC->room.QRfloor,
+ (int) CC->room.QRorder,
- CC->quickroom.QRdefaultview,
- CC->quickroom.QRflags2
+ CC->room.QRdefaultview,
+ CC->room.QRflags2
);
}
*/
int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
int old_floor = 0;
- struct quickroom qrbuf;
- struct quickroom qrtmp;
+ struct ctdlroom qrbuf;
+ struct ctdlroom qrtmp;
int ret = 0;
struct floor *fl;
struct floor flbuf;
long owner = 0L;
- char actual_old_name[SIZ];
+ char actual_old_name[ROOMNAMELEN];
- lprintf(9, "CtdlRenameRoom(%s, %s, %d)\n",
+ CtdlLogPrintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n",
old_name, new_name, new_floor);
if (new_floor >= 0) {
- fl = cgetfloor(new_floor);
+ fl = CtdlGetCachedFloor(new_floor);
if ((fl->f_flags & F_INUSE) == 0) {
return(crr_invalid_floor);
}
}
- begin_critical_section(S_QUICKROOM);
+ 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->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != qrbuf.QRroomaide)
- && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->usersupp.usernum))) ) {
+ 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;
}
else {
/* Rename it */
- strcpy(actual_old_name, qrbuf.QRname);
+ safestrncpy(actual_old_name, qrbuf.QRname, sizeof actual_old_name);
if (qrbuf.QRflags & QR_MAILBOX) {
owner = atol(qrbuf.QRname);
}
new_floor = old_floor;
}
qrbuf.QRfloor = new_floor;
- putroom(&qrbuf);
+ CtdlPutRoom(&qrbuf);
begin_critical_section(S_CONFIG);
ret = crr_ok;
}
- end_critical_section(S_QUICKROOM);
+ 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);
- lgetfloor(&flbuf, CC->quickroom.QRfloor);
+ CtdlLogPrintf(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, CC->quickroom.QRfloor);
+ lputfloor(&flbuf, new_floor);
+ CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
}
/* ...and everybody say "YATTA!" */
*/
void cmd_setr(char *args)
{
- char buf[SIZ];
+ char buf[256];
int new_order = 0;
int r;
int new_floor;
/* When is a new name more than just a new name? When the old name
* has a namespace prefix.
*/
- if (CC->quickroom.QRflags & QR_MAILBOX) {
- sprintf(new_name, "%010ld.", atol(CC->quickroom.QRname) );
+ if (CC->room.QRflags & QR_MAILBOX) {
+ sprintf(new_name, "%010ld.", atol(CC->room.QRname) );
} else {
- strcpy(new_name, "");
+ safestrncpy(new_name, "", sizeof new_name);
}
- extract(&new_name[strlen(new_name)], args, 0);
+ extract_token(&new_name[strlen(new_name)], args, 0, '|', (sizeof new_name - strlen(new_name)));
- r = CtdlRenameRoom(CC->quickroom.QRname, new_name, new_floor);
+ r = CtdlRenameRoom(CC->room.QRname, new_name, new_floor);
if (r == crr_room_not_found) {
- cprintf("%d Internal error - room not found?\n", ERROR);
+ 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);
+ 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->quickroom.QRname);
+ CC->room.QRname);
} else if (r != crr_ok) {
cprintf("%d Error: CtdlRenameRoom() returned %d\n",
- ERROR, r);
+ ERROR + INTERNAL_ERROR, r);
}
if (r != crr_ok) {
return;
}
- getroom(&CC->quickroom, new_name);
+ CtdlGetRoom(&CC->room, new_name);
/* Now we have to do a bunch of other stuff */
new_order = 127;
}
- lgetroom(&CC->quickroom, CC->quickroom.QRname);
+ CtdlGetRoomLock(&CC->room, CC->room.QRname);
/* Directory room */
- extract(buf, args, 2);
+ extract_token(buf, args, 2, '|', sizeof buf);
buf[15] = 0;
- safestrncpy(CC->quickroom.QRdirname, buf,
- sizeof CC->quickroom.QRdirname);
+ safestrncpy(CC->room.QRdirname, buf,
+ sizeof CC->room.QRdirname);
/* Default view */
if (num_parms(args) >= 8) {
- CC->quickroom.QRdefaultview = extract_int(args, 7);
+ CC->room.QRdefaultview = extract_int(args, 7);
}
/* Second set of flags */
if (num_parms(args) >= 9) {
- CC->quickroom.QRflags2 = extract_int(args, 8);
+ CC->room.QRflags2 = extract_int(args, 8);
}
/* Misc. flags */
- CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE);
+ 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;
+ 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->quickroom.QRname, config.c_baseroom,
+ if (!strncasecmp(CC->room.QRname, config.c_baseroom,
ROOMNAMELEN)) {
- CC->quickroom.QRorder = 0;
- CC->quickroom.QRpasswd[0] = '\0';
- CC->quickroom.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED &
+ CC->room.QRorder = 0;
+ CC->room.QRpasswd[0] = '\0';
+ CC->room.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED &
QR_GUESSNAME & QR_PREFONLY & QR_MAILBOX);
- CC->quickroom.QRflags |= QR_PERMANENT;
+ CC->room.QRflags |= QR_PERMANENT;
} else {
/* March order (doesn't apply to AIDEROOM) */
if (num_parms(args) >= 7)
- CC->quickroom.QRorder = (char) new_order;
+ CC->room.QRorder = (char) new_order;
/* Room password */
- extract(buf, args, 1);
+ extract_token(buf, args, 1, '|', sizeof buf);
buf[10] = 0;
- safestrncpy(CC->quickroom.QRpasswd, buf,
- sizeof CC->quickroom.QRpasswd);
+ 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->quickroom.QRgen);
+ time(&CC->room.QRgen);
}
}
/* Some changes can't apply to AIDEROOM */
- if (!strncasecmp(CC->quickroom.QRname, config.c_baseroom,
+ if (!strncasecmp(CC->room.QRname, config.c_baseroom,
ROOMNAMELEN)) {
- CC->quickroom.QRorder = 0;
- CC->quickroom.QRflags &= ~QR_MAILBOX;
- CC->quickroom.QRflags |= QR_PERMANENT;
+ CC->room.QRorder = 0;
+ CC->room.QRflags &= ~QR_MAILBOX;
+ CC->room.QRflags |= QR_PERMANENT;
}
/* Write the room record back to disk */
- lputroom(&CC->quickroom);
+ CtdlPutRoomLock(&CC->room);
/* Create a room directory if necessary */
- if (CC->quickroom.QRflags & QR_DIRECTORY) {
- snprintf(buf, sizeof buf,
- "mkdir ./files/%s </dev/null >/dev/null 2>/dev/null",
- CC->quickroom.QRdirname);
- system(buf);
- }
- snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
- aide_message(buf);
+ 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);
+ CtdlAideMessage(buf, "Room modification Message");
cprintf("%d Ok\n", CIT_OK);
}
/*
* get the name of the room aide for this room
*/
-void cmd_geta(void)
+void cmd_geta(char *cmdbuf)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
if (CtdlAccessCheck(ac_logged_in)) return;
- if (getuserbynumber(&usbuf, CC->quickroom.QRroomaide) == 0) {
+ if (CtdlGetUserByNumber(&usbuf, CC->room.QRroomaide) == 0) {
cprintf("%d %s\n", CIT_OK, usbuf.fullname);
} else {
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;
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->quickroom, CC->quickroom.QRname);
+ CtdlGetRoomLock(&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;
+ CtdlPutRoomLock(&CC->room);
/*
* We have to post the change notice _after_ writing changes to
* the room table, otherwise it would deadlock!
*/
if (post_notice == 1) {
- if (strlen(usbuf.fullname) > 0)
+ if (!IsEmptyStr(usbuf.fullname))
snprintf(buf, sizeof buf,
- "%s is now room aide for %s>\n",
- usbuf.fullname, CC->quickroom.QRname);
+ "%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->quickroom.QRname);
- aide_message(buf);
+ "There is now no room aide for \"%s\".\n",
+ CC->room.QRname);
+ CtdlAideMessage(buf, "Aide Room Modification");
}
cprintf("%d Ok\n", CIT_OK);
}
-/*
- * Generate an associated file name for a room
- */
-void assoc_file_name(char *buf, size_t n,
- struct quickroom *qrbuf, const char *prefix)
-{
- snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber);
-}
-
/*
* retrieve info file for this room
*/
-void cmd_rinf(void)
+void cmd_rinf(char *gargs)
{
char filename[128];
char buf[SIZ];
FILE *info_fp;
- assoc_file_name(filename, sizeof 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);
while (fgets(buf, sizeof buf, info_fp) != NULL) {
- if (strlen(buf) > 0)
+ if (!IsEmptyStr(buf))
buf[strlen(buf) - 1] = 0;
cprintf("%s\n", buf);
}
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 CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf)
+{
+ char old_name[ROOMNAMELEN];
+ static int seq = 0;
+
+ CtdlLogPrintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n",
+ qrbuf->QRname);
+
+ safestrncpy(old_name, qrbuf->QRname, sizeof old_name);
+
+ 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,
+ * 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 */
+
+ CtdlPutRoom(qrbuf);
+
+ b_deleteroom(old_name);
+}
+
+
+
/*
* Back end processing to delete a room and everything associated with it
+ * (This one is synchronous and should only get called by THE DREADED
+ * AUTO-PURGER in serv_expire.c. All user-facing code should call
+ * the asynchronous schedule_room_for_deletion() instead.)
*/
-void delete_room(struct quickroom *qrbuf)
+void CtdlDeleteRoom(struct ctdlroom *qrbuf)
{
struct floor flbuf;
char filename[100];
+ /* TODO: filename magic? does this realy work? */
- lprintf(9, "Deleting room <%s>\n", qrbuf->QRname);
+ CtdlLogPrintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname);
/* Delete the info file */
- assoc_file_name(filename, sizeof filename, qrbuf, "info");
+ assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir);
unlink(filename);
/* Delete the image file */
- assoc_file_name(filename, sizeof 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, sizeof 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);
+ CtdlGetRoomLock(qrbuf, qrbuf->QRname);
qrbuf->QRflags = 0;
- lputroom(qrbuf);
+ CtdlPutRoomLock(qrbuf);
/* then decrement the reference count for the floor */
lgetfloor(&flbuf, (int) (qrbuf->QRfloor));
/*
* Check access control for deleting a room
*/
-int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) {
+int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
return(0);
}
- if (is_noneditable(qr)) {
+ if (CtdlIsNonEditable(qr)) {
return(0);
}
if (strlen(qr->QRname) < 12) return(0); /* bad name */
- if (atol(qr->QRname) != CC->usersupp.usernum) {
+ if (atol(qr->QRname) != CC->user.usernum) {
return(0); /* not my room */
}
/* Can't delete your Mail> room */
- if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+ if (!strcasecmp(&qr->QRname[11], MAILROOM)) return(0);
/* Otherwise it's ok */
return(1);
*/
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 (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom) == 0) {
+ 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(config.c_baseroom, 0, 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 */
+ CtdlScheduleRoomForDeletion(&CC->room);
+
+ /* Return to the Lobby */
+ CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL);
/* tell the world what we did */
- snprintf(aaa, sizeof aaa, "%s> killed by %s\n",
+ snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
deleted_room_name, CC->curr_user);
- aide_message(aaa);
+ 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,
int really_create,
- int avoid_access)
+ int avoid_access,
+ int new_room_view)
{
- struct quickroom qrbuf;
+ struct ctdlroom qrbuf;
struct floor flbuf;
- struct visit vbuf;
+ visit vbuf;
- lprintf(9, "create_room(%s)\n", new_room_name);
- if (getroom(&qrbuf, new_room_name) == 0) {
- lprintf(9, "%s already exists.\n", new_room_name);
- return (0); /* already exists */
- }
+ CtdlLogPrintf(CTDL_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);
+ return(0);
+ }
- memset(&qrbuf, 0, sizeof(struct quickroom));
+ memset(&qrbuf, 0, sizeof(struct ctdlroom));
safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd);
qrbuf.QRflags = QR_INUSE;
if (new_room_type > 0)
qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
if (new_room_type == 2)
qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
- if ( (new_room_type == 4) || (new_room_type == 5) )
+ if ( (new_room_type == 4) || (new_room_type == 5) ) {
qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
+ /* qrbuf.QRflags2 |= QR2_SUBJECTREQ; */
+ }
/* If the user is requesting a personal room, set up the room
* name accordingly (prepend the user number)
*/
if (new_room_type == 4) {
- MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->usersupp, new_room_name);
+ CtdlMailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
}
else {
safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
* 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);
}
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);
+ CtdlPutRoom(&qrbuf);
/* bump the reference count on whatever floor the room is on */
lgetfloor(&flbuf, (int) qrbuf.QRfloor);
/* Grant the creator access to the room unless the avoid_access
* parameter was specified.
*/
- if (avoid_access == 0) {
- lgetuser(&CC->usersupp, CC->curr_user);
- CtdlGetRelationship(&vbuf, &CC->usersupp, &qrbuf);
+ 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->usersupp, &qrbuf);
- lputuser(&CC->usersupp);
+ CtdlSetRelationship(&vbuf, &CC->user, &qrbuf);
}
/* resume our happy day */
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 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);
+ if ((IsEmptyStr(new_room_name)) && (cre8_ok == 1)) {
+ 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) {
+ fl = CtdlGetCachedFloor(extract_int(args, 4));
+ if (fl == NULL) {
+ cprintf("%d Invalid floor number.\n",
+ ERROR + INVALID_FLOOR_OPERATION);
+ return;
+ }
+ else if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
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)) {
+ if ((IsEmptyStr(new_room_name)) && (cre8_ok == 0)) {
cprintf("%d Ok to create rooms.\n", CIT_OK);
return;
}
if ((new_room_type < 0) || (new_room_type > 5)) {
- cprintf("%d Invalid room type.\n", ERROR);
+ cprintf("%d Invalid room type.\n", ERROR + ILLEGAL_VALUE);
return;
}
if (new_room_type == 5) {
- if ((config.c_aide_mailboxes == 0)
- || (CC->usersupp.axlevel < 6)) {
+ if (CC->user.axlevel < AxAideU) {
cprintf("%d Higher access required\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
+ 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);
+ 0, avoid_access, new_room_view);
if (newflags == 0) {
cprintf("%d '%s' already exists.\n",
ERROR + ALREADY_EXISTS, new_room_name);
/* If we reach this point, the room needs to be created. */
- newflags = create_room(new_room_name,
- new_room_type, new_room_pass, new_room_floor, 1, 0);
+ newflags = CtdlCreateRoom(new_room_name,
+ new_room_type, new_room_pass, new_room_floor, 1, 0,
+ new_room_view);
/* post a message in Aide> describing the new room */
- 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);
+ 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 : "")
+ );
+ CtdlAideMessage(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", CIT_OK);
return;
}
- assoc_file_name(infofilename, sizeof infofilename, &CC->quickroom, "info");
- lprintf(9, "opening\n");
+ assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir);
+ CtdlLogPrintf(CTDL_DEBUG, "opening\n");
fp = fopen(infofilename, "w");
- lprintf(9, "checking\n");
+ CtdlLogPrintf(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);
+ CtdlGetRoomLock(&CC->room, CC->room.QRname); /* lock so no one steps on us */
+ CC->room.QRinfo = CC->room.QRhighest + 1L;
+ CtdlPutRoomLock(&CC->room);
}
/*
* cmd_lflr() - List all known floors
*/
-void cmd_lflr(void)
+void cmd_lflr(char *gargs)
{
int a;
struct floor flbuf;
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,
*/
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 (IsEmptyStr(new_floor_name)) {
+ cprintf("%d Blank floor name not allowed.\n",
+ ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
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)
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", CIT_OK);
}
+
+
+/*****************************************************************************/
+/* MODULE INITIALIZATION STUFF */
+/*****************************************************************************/
+
+CTDL_MODULE_INIT(room_ops)
+{
+ 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 "room_ops";
+}
projects / citadel.git / blobdiff