#include <errno.h>
#include "citadel.h"
#include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "database.h"
#include "config.h"
#include "room_ops.h"
}
/* ...and now the other parameters */
- cprintf("|%u|%d|%d\n",
+ cprintf("|%u|%d|%d|%d\n",
qrbuf->QRflags,
(int) qrbuf->QRfloor,
- (int) qrbuf->QRorder);
+ (int) qrbuf->QRorder,
+ (int) qrbuf->QRflags2
+ );
}
+void cmd_lprm_backend(struct quickroom *qrbuf, void *data)
+{
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
+
+ if ( ((qrbuf->QRflags & QR_PRIVATE) == 0)
+ && ((qrbuf->QRflags & QR_MAILBOX) == 0)
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
+ list_roomname(qrbuf);
+}
+
+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
*/
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);
+ CC->quickroom.QRname,
+ new_messages, total_messages
+ );
- 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|\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->quickroom.QRflags,
+ (long)CC->quickroom.QRhighest,
+ (long)vbuf.v_lastseen,
+ (int)rmailflag,
+ (int)raideflag,
+ (int)newmailcount,
+ (int)CC->quickroom.QRfloor,
+ (int)vbuf.v_view,
+ (int)CC->quickroom.QRdefaultview
+ );
+ }
}
if (CtdlAccessCheck(ac_room_aide)) return;
getroom(&CC->quickroom, CC->quickroom.QRname);
- cprintf("%d%c%s|%s|%s|%d|%d|%d|%d\n",
+ cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n",
CIT_OK,
CtdlCheckExpress(),
(int) CC->quickroom.QRfloor,
(int) CC->quickroom.QRorder,
- CC->quickroom.QRdefaultview);
+ CC->quickroom.QRdefaultview,
+ CC->quickroom.QRflags2
+ );
}
struct floor *fl;
struct floor flbuf;
long owner = 0L;
+ char actual_old_name[SIZ];
lprintf(9, "CtdlRenameRoom(%s, %s, %d)\n",
old_name, new_name, new_floor);
else {
/* Rename it */
+ strcpy(actual_old_name, qrbuf.QRname);
if (qrbuf.QRflags & QR_MAILBOX) {
owner = atol(qrbuf.QRname);
}
* records, so we have to delete the old one.
*/
if (strcasecmp(new_name, old_name)) {
- b_deleteroom(old_name);
+ b_deleteroom(actual_old_name);
}
ret = crr_ok;
CC->quickroom.QRdefaultview = extract_int(args, 7);
}
+ /* Second set of flags */
+ if (num_parms(args) >= 9) {
+ CC->quickroom.QRflags2 = extract_int(args, 8);
+ }
+
/* Misc. flags */
CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE);
/* Clean up a client boo-boo: if the client set the room to
char aaa[SIZ];
unsigned newflags;
struct floor *fl;
+ int avoid_access = 0;
cre8_ok = extract_int(args, 0);
extract(new_room_name, args, 1);
new_room_name[ROOMNAMELEN - 1] = 0;
new_room_type = extract_int(args, 2);
extract(new_room_pass, args, 3);
+ avoid_access = extract_int(args, 5);
new_room_pass[9] = 0;
new_room_floor = 0;
/* Check to make sure the requested room name doesn't already exist */
newflags = create_room(new_room_name,
- new_room_type, new_room_pass, new_room_floor, 0, 0);
+ new_room_type, new_room_pass, new_room_floor,
+ 0, avoid_access);
if (newflags == 0) {
cprintf("%d '%s' already exists.\n",
ERROR + ALREADY_EXISTS, new_room_name);
extract(new_floor_name, argbuf, 0);
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);