#include <stdio.h>
#include <sys/stat.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 "control.h"
#include "tools.h"
+struct floor *floorcache[MAXFLOORS];
+
/*
* Generic routine for determining user access to rooms
*/
}
NEWMSG: /* By the way, we also check for the presence of new messages */
- if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+ if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
retval = retval | UA_HASNEWMSGS;
}
return (retval);
}
+/*
+ * cgetfloor() - Get floor record from *cache* (loads from disk if needed)
+ *
+ * This is strictly a performance hack.
+ */
+struct floor *cgetfloor(int floor_num) {
+ static int initialized = 0;
+ int i;
+
+ 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);
+ }
+
+ return(floorcache[floor_num]);
+}
+
+
+
/*
* putfloor() - store floor data on disk
*/
{
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! */
+ if (floorcache[floor_num] != NULL) {
+ phree(floorcache[floor_num]);
+ floorcache[floor_num] = NULL;
+ }
}
struct quickroom qrbuf;
struct cdbdata *cdbqr;
- cdb_begin_transaction();
cdb_rewind(CDB_QUICKROOM);
while (cdbqr = cdb_next_item(CDB_QUICKROOM), cdbqr != NULL) {
if (qrbuf.QRflags & QR_INUSE)
(*CallBack)(&qrbuf, in_data);
}
- cdb_end_transaction();
}
if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
if (msglist[a] > 0L) {
++total_messages;
- if (msglist[a] > vbuf.v_lastseen) {
+ if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
++new_messages;
}
}
if (ok == 1) {
if ((QRscratch.QRflags & QR_PASSWORDED) &&
((ra & UA_KNOWN) == 0) &&
- (strcasecmp(QRscratch.QRpasswd, password))
+ (strcasecmp(QRscratch.QRpasswd, password)) &&
+ (CC->usersupp.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)) {
+ ((ra & UA_KNOWN) == 0) &&
+ (CC->usersupp.axlevel < 6)
+ ) {
goto NOPE;
} else {
usergoto(towhere, 1, NULL, NULL);
struct usersupp temp;
struct cdbdata *cdbus;
- cdb_begin_transaction();
getuser(&CC->usersupp, CC->curr_user);
if (CtdlAccessCheck(ac_room_aide)) return;
)
cprintf("%s\n", temp.fullname);
}
- cdb_end_transaction();
cprintf("000\n");
}
void cmd_setr(char *args)
{
char buf[SIZ];
+ struct floor *fl;
struct floor flbuf;
char old_name[ROOMNAMELEN];
int old_floor;
if (num_parms(args) >= 6) {
- getfloor(&flbuf, extract_int(args, 5));
- if ((flbuf.f_flags & F_INUSE) == 0) {
+ fl = cgetfloor(extract_int(args, 5));
+ if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
}
+
+/*
+ * Check access control for deleting a room
+ */
+int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *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->usersupp.usernum) {
+ return(0); /* not my room */
+ }
+
+ /* Can't delete your Mail> room */
+ if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+
+ /* Otherwise it's ok */
+ return(1);
+ }
+
+ /*
+ * For normal rooms, just check for aide or room aide status.
+ */
+ else {
+ return(is_room_aide());
+ }
+
+ /* Should never get to this point, but to keep the compiler quiet... */
+ return(0);
+}
+
/*
* aide command: kill the current room
*/
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->quickroom) == 0) {
+ cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
return;
}
if (kill_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)
{
struct quickroom qrbuf;
return (0); /* already exists */
}
+
memset(&qrbuf, 0, sizeof(struct quickroom));
- safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
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, &CC->usersupp, 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.
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;
char aaa[SIZ];
unsigned newflags;
struct quickroom qrbuf;
- struct floor flbuf;
+ struct floor *fl;
cre8_ok = extract_int(args, 0);
extract(new_room_name, args, 1);
}
if (num_parms(args) >= 5) {
- getfloor(&flbuf, extract_int(args, 4));
- if ((flbuf.f_flags & F_INUSE) == 0) {
+ fl = cgetfloor(extract_int(args, 4));
+ if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
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);
- }
-
/* 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);
+ if (newflags == 0) {
cprintf("%d '%s' already exists.\n",
ERROR + ALREADY_EXISTS, qrbuf.QRname);
return;
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);
/* post a message in Aide> describing the new room */
safestrncpy(aaa, new_room_name, sizeof aaa);