From 1baa8da70fac262b47eacef1aad2f3e244184d82 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 14 Sep 2013 23:00:46 +0200 Subject: [PATCH] user access level helper moved to the other accesslevel helpers: user_ops.c --- citadel/citserver.c | 46 --------------------------------------------- citadel/user_ops.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index 666c9cb52..d8eab8d2a 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -368,52 +368,6 @@ int CtdlIsPublicClient(void) -/* - * Convenience function. - */ -int CtdlAccessCheck(int required_level) { - - if (CC->internal_pgm) return(0); - if (required_level >= ac_internal) { - cprintf("%d This is not a user-level command.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) { - cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); - return(-1); - } - - if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) { - cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); - return(-1); - } - - if (CC->user.axlevel >= AxAideU) return(0); - if (required_level >= ac_aide) { - cprintf("%d This command requires Admin access.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - if (is_room_aide()) return(0); - if (required_level >= ac_room_aide) { - cprintf("%d This command requires Admin or Room Admin access.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - /* shhh ... succeed quietly */ - return(0); -} - - - - - - - /* * Back-end function for starting a session diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 3e28fec7c..71c0af3d3 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -390,6 +390,47 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { return(0); } +/* + * Convenience function. + */ +int CtdlAccessCheck(int required_level) +{ + if (CC->internal_pgm) return(0); + if (required_level >= ac_internal) { + cprintf("%d This is not a user-level command.\n", + ERROR + HIGHER_ACCESS_REQUIRED); + return(-1); + } + + if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) { + cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); + return(-1); + } + + if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) { + cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); + return(-1); + } + + if (CC->user.axlevel >= AxAideU) return(0); + if (required_level >= ac_aide) { + cprintf("%d This command requires Admin access.\n", + ERROR + HIGHER_ACCESS_REQUIRED); + return(-1); + } + + if (is_room_aide()) return(0); + if (required_level >= ac_room_aide) { + cprintf("%d This command requires Admin or Room Admin access.\n", + ERROR + HIGHER_ACCESS_REQUIRED); + return(-1); + } + + /* shhh ... succeed quietly */ + return(0); +} + + /* * Is the user currently logged in an Admin? -- 2.30.2