From d553a5a769d887029c43dc5e1bc80664be0f8dd7 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 3 Sep 2010 12:50:53 -0400 Subject: [PATCH] Allow MSGS command to operate in guest mode. --- citadel/msgbase.c | 7 ++----- citadel/room_ops.c | 25 +++++-------------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 2af2d3952..a62daa15c 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -797,6 +797,8 @@ void cmd_msgs(char *cmdbuf) char search_string[1024]; ForEachMsgCallback CallBack; + if (CtdlAccessCheck(ac_logged_in_or_guest)) return; + extract_token(which, cmdbuf, 0, '|', sizeof which); cm_ref = extract_int(cmdbuf, 1); extract_token(search_string, cmdbuf, 1, '|', sizeof search_string); @@ -833,11 +835,6 @@ void cmd_msgs(char *cmdbuf) else mode = MSGS_ALL; - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { - cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN); - return; - } - if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) { cprintf("%d Full text index is not enabled on this server.\n", ERROR + CMD_NOT_SUPPORTED); diff --git a/citadel/room_ops.c b/citadel/room_ops.c index de180edf3..053971a60 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -695,10 +695,7 @@ void cmd_lrms(char *argbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (CtdlGetUser(&CC->user, CC->curr_user)) { - cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); - return; - } + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d Accessible rooms:\n", LISTING_FOLLOWS); CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched); @@ -733,10 +730,7 @@ void cmd_lkra(char *argbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (CtdlGetUser(&CC->user, CC->curr_user)) { - cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); - return; - } + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d Known rooms:\n", LISTING_FOLLOWS); CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched); @@ -802,10 +796,7 @@ void cmd_lkrn(char *argbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (CtdlGetUser(&CC->user, CC->curr_user)) { - cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); - return; - } + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d Rooms w/ new msgs:\n", LISTING_FOLLOWS); CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched); @@ -841,10 +832,7 @@ void cmd_lkro(char *argbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (CtdlGetUser(&CC->user, CC->curr_user)) { - cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); - return; - } + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS); CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched); @@ -880,10 +868,7 @@ void cmd_lzrm(char *argbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (CtdlGetUser(&CC->user, CC->curr_user)) { - cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); - return; - } + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d Zapped rooms:\n", LISTING_FOLLOWS); CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched); -- 2.30.2