From: Art Cancro Date: Tue, 31 Jul 2012 14:56:09 +0000 (-0400) Subject: Changing the name of the 'Aide' access level to 'Admin' X-Git-Tag: v8.20~275^2~2 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=65a49d0eab7a8ae01de45495fdfdf67bdd8bd189 Changing the name of the 'Aide' access level to 'Admin' --- diff --git a/citadel/axdefs.h b/citadel/axdefs.h index bb23fd9ae..e92f74171 100644 --- a/citadel/axdefs.h +++ b/citadel/axdefs.h @@ -7,9 +7,9 @@ char *axdefs[]={ "Local User", "Network User", "Preferred User", - "Aide", - "Sysop" - }; + "Admin", + "Admin" +}; #define AXDEFS 1 diff --git a/citadel/citserver.c b/citadel/citserver.c index 7e5538b51..42208a7da 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -684,14 +684,14 @@ int CtdlAccessCheck(int required_level) { if (CC->user.axlevel >= AxAideU) return(0); if (required_level >= ac_aide) { - cprintf("%d This command requires Aide access.\n", + 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 Aide or Room Aide access.\n", + cprintf("%d This command requires Admin or Room Admin access.\n", ERROR + HIGHER_ACCESS_REQUIRED); return(-1); } diff --git a/citadel/help/aide b/citadel/help/aide index 38d535521..0a084db7e 100644 --- a/citadel/help/aide +++ b/citadel/help/aide @@ -1,30 +1,30 @@ -The following commands are available only to Aides. A subset of these +The following commands are available only to Admins. A subset of these commands are available to room aides when they are currently in the room they are room aide for. - <.> ide ill this room (Delete the current room) - <.> ide dit this room (Edit the current room's parameters) - <.> ide ho knows room (List users with access to this room) - <.> ide edit ser (Change user's access level, password, etc.) - <.> ide alidate new users (Process new user registrations) - <.> ide enter nfo file (Create/change this room's banner) - <.> ide oom nvite user (Grant access to an invitation-only room) - <.> ide oom ick out user (Revoke access to an invitation-only room) - <.> ide ile elete (Delete a file from the room's directory) - <.> ide ile end over net (Transmit a file to another node) - <.> ide ile ove (Move a file to another room's directory) - <.> ide essage edit: (Edit system banners) - <.> ide

ost (Post a message on behalf of another user) - <.> ide ystem configuration eneral (Edit global site config) - <.> ide ystem configuration nternet (Edit Internet domains) - <.> ide ystem configuration check essage base (Internal checks) - <.> ide ystem configuration etwork (Netting with other Citadels) - <.> ide ystem configuration network ilter list - <.> ide erminate server ow (Shut down Citadel server now) - <.> ide erminate server cheduled (Shut down Citadel server later) - <.> ide mailing ist recipients (For mailing list rooms) - <.> ide mailing list igest recipients (For mailing list rooms) - <.> ide etwork room sharing (Replication with other Citadels) + <.> dmin ill this room (Delete the current room) + <.> dmin dit this room (Edit the current room's parameters) + <.> dmin ho knows room (List users with access to this room) + <.> dmin edit ser (Change user's access level, password, etc.) + <.> dmin alidate new users (Process new user registrations) + <.> dmin enter nfo file (Create/change this room's banner) + <.> dmin oom nvite user (Grant access to an invitation-only room) + <.> dmin oom ick out user (Revoke access to an invitation-only room) + <.> dmin ile elete (Delete a file from the room's directory) + <.> dmin ile end over net (Transmit a file to another node) + <.> dmin ile ove (Move a file to another room's directory) + <.> dmin essage edit: (Edit system banners) + <.> dmin

ost (Post a message on behalf of another user) + <.> dmin ystem configuration eneral (Edit global site config) + <.> dmin ystem configuration nternet (Edit Internet domains) + <.> dmin ystem configuration check essage base (Internal checks) + <.> dmin ystem configuration etwork (Netting with other Citadels) + <.> dmin ystem configuration network ilter list + <.> dmin erminate server ow (Shut down Citadel server now) + <.> dmin erminate server cheduled (Shut down Citadel server later) + <.> dmin mailing ist recipients (For mailing list rooms) + <.> dmin mailing list igest recipients (For mailing list rooms) + <.> dmin etwork room sharing (Replication with other Citadels) In addition, the ove and elete commands are available at the message prompt. diff --git a/citadel/help/intro b/citadel/help/intro index bf3e3cd7f..2d3c336eb 100644 --- a/citadel/help/intro +++ b/citadel/help/intro @@ -1,5 +1,5 @@ Welcome to ^humannode! - New User's Introduction to the BBS + New User's Introduction to the site This is an introduction to ^humannode and to the Citadel BBS concept. It is intended for new users so that they can more easily become @@ -69,39 +69,38 @@ login, you will be placed in the Lobby>. The second is Mail>. In Mail>, when you post a messages, you are prompted to enter the person (handle) who you want to send the message to. Only the person who you send the message to can read the message. -NO ONE else can read it, not even the aides. Mail> is the first room +NO ONE else can read it, not even the admins. Mail> is the first room on the scanlist, and is un-appable, so you can be sure that the person will get the message. - System aides - ------------ - These people, along with the room aides, keep the BBS running -smoothly. + System admins + ------------- + These people, along with the room admins, keep the site running smoothly. - Among the many things that aides do are: create rooms, delete + Among the many things that admins do are: create rooms, delete rooms, set access levels, invite users, check registration, grant -room aide status, and countless other things. They have access to the -Aide> room, a special room only for aides. +room admin status, and countless other things. They have access to the +Aide> room, a special room only for admins. If you enter a mail message to "Sysop" it will be placed in the -Aide> room so that the next aide online will read it and deal with it. -Aides cannot ap rooms. All the rooms are always on each aide's -scanlist. Aides can read *any* and *every* room, but they *CAN* *NOT* +Aide> room so that the next admin online will read it and deal with it. +Admins cannot ap rooms. All the rooms are always on each admin's +scanlist. Admins can read *any* and *every* room, but they *CAN* *NOT* read other user's Mail! - Room aides - ---------- - Room aides are granted special privileges in rooms that they aide. -They are *NOT* true system aides; their power extends only over the -rooms that they control, and they answer to the system aides. + Room admins + ----------- + Room admins are granted special privileges in specific rooms. +They are *NOT* true system admins; their power extends only over the +rooms that they control, and they answer to the system admins. - A room aide's job is to keep the topic of the their room on track, -with nudges in the right direction now and then. A room aide can also + A room admin's job is to keep the topic of the their room on track, +with nudges in the right direction now and then. A room admin can also move an off topic post to another room, or delete a post, if he/she feels it is necessary. - Currently, very few rooms have room aides. Most rooms do not need -their own specific room aide. Being a room aide requires a certain + Currently, very few rooms have room admins. Most rooms do not need +their own specific room admin. Being a room admin requires a certain amount of trust, due to the additional privileges granted. Citadel messages diff --git a/citadel/help/summary b/citadel/help/summary index 83d3c5c7c..bc075919f 100644 --- a/citadel/help/summary +++ b/citadel/help/summary @@ -77,7 +77,7 @@ commands are available: see the name you enter rather than the actual name of the room you're in) <.> holist ostname Masquerade your host name - <.> nter sername Masquerade your user name (Aides only) + <.> nter sername Masquerade your user name (Admins only) <.> holist tealth mode Enter/exit "stealth mode" (when in stealth mode you are invisible on the wholist) @@ -90,21 +90,21 @@ commands are available: ;ap floor - zap (forget) all rooms on this floor - Aide (administrative) commands: + Administrative commands: - <.> ide ill this room - <.> ide dit this room - <.> ide ho knows room - <.> ide edit ser - <.> ide alidate new users - <.> ide enter nfo file - <.> ide oom nvite user - <.> ide oom ick out user - <.> ide ile elete - <.> ide ile end over net - <.> ide ile ove - <.> ide essage edit: - <.> ide

ost - <.> ide ystem configuration - <.> ide erminate server ow - <.> ide erminate server cheduled + <.> dmin ill this room + <.> dmin dit this room + <.> dmin ho knows room + <.> dmin edit ser + <.> dmin alidate new users + <.> dmin enter nfo file + <.> dmin oom nvite user + <.> dmin oom ick out user + <.> dmin ile elete + <.> dmin ile end over net + <.> dmin ile ove + <.> dmin essage edit: + <.> dmin

ost + <.> dmin ystem configuration + <.> dmin erminate server ow + <.> dmin erminate server cheduled diff --git a/citadel/messages/roomaccess b/citadel/messages/roomaccess index 4dabb9605..0aebbac56 100644 --- a/citadel/messages/roomaccess +++ b/citadel/messages/roomaccess @@ -8,13 +8,13 @@ the room's name. No hints are given by the system. to get access. Invitation-only: users may only gain access to this type of room if -an Aide gives it to them. +an Admin gives it to them. Personal: this type of room acts as a user-specific "mailbox." Once a user has access to a private room, it shows up on the known -rooms list and acts the same as any other room. Aides may kick users out +rooms list and acts the same as any other room. Admins may kick users out of any type of private room, and out of excludable rooms. Please also keep -in mind that Aides have access to ALL private rooms. +in mind that Admins have access to ALL private rooms. Before making it private, think about it. Does it really NEED to be private? diff --git a/citadel/msgbase.c b/citadel/msgbase.c index abb47ca16..4af4355cb 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -4037,7 +4037,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { /* User flagged ok? */ if (who->flags & US_INTERNET) return(2); - /* Aide level access? */ + /* Admin level access? */ if (who->axlevel >= AxAideU) return(3); /* No mail for you! */ @@ -4920,7 +4920,7 @@ void cmd_move(char *args) */ permit = 0; - /* Aides can move/copy */ + /* Admins can move/copy */ if (CC->user.axlevel >= AxAideU) permit = 1; /* Room aides can move/copy */ diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 3f08b0105..1e4209bdc 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -1307,7 +1307,7 @@ void cmd_rdir(char *cmdbuf) } /* - * get room parameters (aide or room aide command) + * get room parameters (admin or room admin command) */ void cmd_getr(char *cmdbuf) { @@ -1459,7 +1459,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { /* - * set room parameters (aide or room aide command) + * set room parameters (admin or room admin command) */ void cmd_setr(char *args) { @@ -1605,7 +1605,7 @@ void cmd_setr(char *args) /* - * get the name of the room aide for this room + * get the name of the room admin for this room */ void cmd_geta(char *cmdbuf) { @@ -1622,7 +1622,7 @@ void cmd_geta(char *cmdbuf) /* - * set the room aide for this room + * set the room admin for this room */ void cmd_seta(char *new_ra) { @@ -1654,13 +1654,13 @@ void cmd_seta(char *new_ra) if (post_notice == 1) { if (!IsEmptyStr(usbuf.fullname)) snprintf(buf, sizeof buf, - "%s is now the room aide for \"%s\".\n", + "%s is now the room admin for \"%s\".\n", usbuf.fullname, CC->room.QRname); else snprintf(buf, sizeof buf, - "There is now no room aide for \"%s\".\n", + "There is now no room admin for \"%s\".\n", CC->room.QRname); - CtdlAideMessage(buf, "Aide Room Modification"); + CtdlAideMessage(buf, "Admin Room Modification"); } cprintf("%d Ok\n", CIT_OK); } @@ -1806,13 +1806,13 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) { } /* - * For normal rooms, just check for aide or room aide status. + * For normal rooms, just check for admin or room admin status. */ return(is_room_aide()); } /* - * aide command: kill the current room + * admin command: kill the current room */ void cmd_kill(char *argbuf) { @@ -1905,18 +1905,18 @@ unsigned CtdlCreateRoom(char *new_room_name, } /* If the room is private, and the system administrator has elected - * to automatically grant room aide privileges, do so now. + * to automatically grant room admin privileges, do so now. */ if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) { qrbuf.QRroomaide = CC->user.usernum; } - /* Blog owners automatically become room aides of their blogs. + /* Blog owners automatically become room admins of their blogs. * (In the future we will offer a site-wide configuration setting to suppress this behavior.) */ else if (new_room_view == VIEW_BLOG) { qrbuf.QRroomaide = CC->user.usernum; } - /* Otherwise, set the room aide to undefined. + /* Otherwise, set the room admin to undefined. */ else { qrbuf.QRroomaide = (-1L); @@ -2310,8 +2310,8 @@ CTDL_MODULE_INIT(room_ops) CtdlRegisterProtoHook(cmd_rdir, "RDIR", "List files in room directory"); CtdlRegisterProtoHook(cmd_getr, "GETR", "Get room parameters"); CtdlRegisterProtoHook(cmd_setr, "SETR", "Set room parameters"); - CtdlRegisterProtoHook(cmd_geta, "GETA", "Get the room aide name"); - CtdlRegisterProtoHook(cmd_seta, "SETA", "Set the room aide for this room"); + CtdlRegisterProtoHook(cmd_geta, "GETA", "Get the room admin name"); + CtdlRegisterProtoHook(cmd_seta, "SETA", "Set the room admin for this room"); CtdlRegisterProtoHook(cmd_rinf, "RINF", "Fetch room info file"); CtdlRegisterProtoHook(cmd_kill, "KILL", "Kill (delete) the current room"); CtdlRegisterProtoHook(cmd_cre8, "CRE8", "Create a new room"); diff --git a/citadel/techdoc/delivery-list.txt b/citadel/techdoc/delivery-list.txt index b6663cdb0..e414917b0 100644 --- a/citadel/techdoc/delivery-list.txt +++ b/citadel/techdoc/delivery-list.txt @@ -3,7 +3,7 @@ Description of the custom MIME type "application/x-citadel-delivery-list" This MIME type may be found in the outbound queue room on Citadel systems, which is typically called "__CitadelSMTPspoolout__". The room is flagged as a "system" room, which means that it's completely hidden to everyone, although -an Aide can get to it if the full name is specified (but unlike a normal +an Admin can get to it if the full name is specified (but unlike a normal hidden room, it does not appear in the known rooms list on subsequent visits). Messages in this format contain delivery instructions. Therefore, for each diff --git a/citadel/user_ops.c b/citadel/user_ops.c index f7cb74938..fd8056559 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -369,7 +369,7 @@ void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *pr /* - * Is the user currently logged in an Aide? + * Is the user currently logged in an Admin? */ int is_aide(void) { @@ -381,7 +381,7 @@ int is_aide(void) /* - * Is the user currently logged in an Aide *or* the room aide for this room? + * Is the user currently logged in an Admin *or* the room Admin for this room? */ int is_room_aide(void) { @@ -1589,7 +1589,7 @@ int CtdlInvtKick(char *iuser, int op) { void cmd_invt_kick(char *iuser, int op) { /* - * These commands are only allowed by aides, room aides, + * These commands are only allowed by admins, room admins, * and room namespace owners */ if (is_room_aide()) { @@ -1632,7 +1632,7 @@ void cmd_kick(char *iuser) {cmd_invt_kick(iuser, 0);} int CtdlForgetThisRoom(void) { visit vbuf; - /* On some systems, Aides are not allowed to forget rooms */ + /* On some systems, Admins are not allowed to forget rooms */ if (is_aide() && (config.c_aide_zap == 0) && ((CC->room.QRflags & QR_MAILBOX) == 0) ) { return(1); diff --git a/libcitadel/hash_todo.txt b/libcitadel/hash_todo.txt index ca1072afd..f1f0004e6 100644 --- a/libcitadel/hash_todo.txt +++ b/libcitadel/hash_todo.txt @@ -11,7 +11,7 @@ the DB this way the existing setup tools don't need to be altered. Webcit can then ask for the site wide config using normal MSG* commands. Webcit will need to parse the message into key value pairs which is dead simple to do. -Hmm, just a thought but has anyone wondered about locking things like this so 2 Aides can't +Hmm, just a thought but has anyone wondered about locking things like this so two Admins can't change them at the same time which would result in some changes getting lost. diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 03364a0ba..f4a540e3d 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -722,7 +722,7 @@ extern "C" { #define QR_ANONOPT 1024 /* Anonymous-Option room */ #define QR_NETWORK 2048 /* Shared network room */ #define QR_PREFONLY 4096 /* Preferred status needed to enter */ -#define QR_READONLY 8192 /* Aide status required to post */ +#define QR_READONLY 8192 /* Admin status required to post */ #define QR_MAILBOX 16384 /* Set if this is a private mailbox */ #define QR2_SYSTEM 1 /* System room; hide by default */ @@ -755,7 +755,7 @@ extern "C" { #define UA_HASNEWMSGS 8 /* Unread messages exist in this room */ #define UA_ZAPPED 16 /* User has forgotten (zapped) this room */ #define UA_POSTALLOWED 32 /* User may post top-level messages here */ -#define UA_ADMINALLOWED 64 /* Aide or Room Aide rights exist here */ +#define UA_ADMINALLOWED 64 /* Admin or Room Admin rights exist here */ #define UA_DELETEALLOWED 128 /* User is allowed to delete messages from this room */ #define UA_REPLYALLOWED 256 /* User is allowed to reply to existing messages here */ /* runtime flag extracted from goto reply; not db persistant, should be moved if new flags added */ diff --git a/textclient/aclocal.m4 b/textclient/aclocal.m4 index 899da07b8..e979e6489 100644 --- a/textclient/aclocal.m4 +++ b/textclient/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,14 +13,12 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. diff --git a/textclient/citadel.rc b/textclient/citadel.rc index 351f5b57c..cdf46c9e1 100644 --- a/textclient/citadel.rc +++ b/textclient/citadel.rc @@ -153,7 +153,7 @@ opencmd=xdg-open "%s" # Keep a copy of the original version of this file around as a reference # for the command numbers. They are not documented anywhere else. # -# Access is: 0 (all users), 1 (aides or room aides), 2 (aides only). +# Access is: 0 (all users), 1 (admins or room admins), 2 (admins only). # Please be aware that it is futile to attempt to gain unauthorized access to # the administrative functions of the system by changing all the access levels # to 0. If you do this, you'll simply be able to enter a lot of commands that @@ -216,28 +216,28 @@ cmd=20,0,&Jump: cmd=20,0,&.,&Goto: # cmd=21,0,&.,&Help: -cmd=22,1,&.,&Aide,&Kill this room -cmd=23,1,&.,&Aide,&Edit this room -cmd=24,0,&.,&Aide,&Who knows room -cmd=25,2,&.,&Aide,&User,&Edit -cmd=96,2,&.,&Aide,&User,&Delete -cmd=26,2,&.,&Aide,&Validate new users -cmd=48,1,&.,&Aide,enter &Info file -cmd=27,0,&.,&Aide,&Room,&Invite user -cmd=28,0,&.,&Aide,&Room,&Kick out user -cmd=51,1,&.,&Aide,&File,&Delete -cmd=54,1,&.,&Aide,&File,&Move -cmd=70,2,&.,&Aide,&Message edit: -cmd=78,1,&.,&Aide,&Post -cmd=80,2,&.,&Aide,&System configuration,&General -cmd=82,2,&.,&Aide,&System configuration,&Internet -cmd=88,2,&.,&Aide,&System configuration,&Network -cmd=92,2,&.,&Aide,&System configuration,network &Filter list -cmd=85,2,&.,&Aide,&Terminate server,&Now -cmd=86,2,&.,&Aide,&Terminate server,&Scheduled -cmd=87,1,&.,&Aide,mailing &List recipients -cmd=94,1,&.,&Aide,mailing list &Digest recipients -cmd=89,1,&.,&Aide,&Network room sharing +cmd=22,1,&.,&Admin,&Kill this room +cmd=23,1,&.,&Admin,&Edit this room +cmd=24,0,&.,&Admin,&Who knows room +cmd=25,2,&.,&Admin,&User,&Edit +cmd=96,2,&.,&Admin,&User,&Delete +cmd=26,2,&.,&Admin,&Validate new users +cmd=48,1,&.,&Admin,enter &Info file +cmd=27,0,&.,&Admin,&Room,&Invite user +cmd=28,0,&.,&Admin,&Room,&Kick out user +cmd=51,1,&.,&Admin,&File,&Delete +cmd=54,1,&.,&Admin,&File,&Move +cmd=70,2,&.,&Admin,&Message edit: +cmd=78,1,&.,&Admin,&Post +cmd=80,2,&.,&Admin,&System configuration,&General +cmd=82,2,&.,&Admin,&System configuration,&Internet +cmd=88,2,&.,&Admin,&System configuration,&Network +cmd=92,2,&.,&Admin,&System configuration,network &Filter list +cmd=85,2,&.,&Admin,&Terminate server,&Now +cmd=86,2,&.,&Admin,&Terminate server,&Scheduled +cmd=87,1,&.,&Admin,mailing &List recipients +cmd=94,1,&.,&Admin,mailing list &Digest recipients +cmd=89,1,&.,&Admin,&Network room sharing cmd=29,0,&.,&Terminate,and &Quit cmd=30,0,&.,&Terminate,and &Stay online @@ -311,9 +311,9 @@ cmd=60,0,&;,&Goto floor: cmd=60,0,&.,&Enter,&Floor: cmd=61,0,&;,&Skip to floor: cmd=62,0,&;,&Zap (forget) floor -cmd=63,2,&;,&Aide,&Create floor -cmd=64,2,&;,&Aide,&Edit this floor -cmd=65,2,&;,&Aide,&Kill this floor +cmd=63,2,&;,&Admin,&Create floor +cmd=64,2,&;,&Admin,&Edit this floor +cmd=65,2,&;,&Admin,&Kill this floor cmd=68,0,&;,&Known rooms cmd=66,0,&.,&Enter,&Bio cmd=67,0,&.,&Read,&Bio diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c index 3b958891e..d5f187c3d 100644 --- a/textclient/src/citadel.c +++ b/textclient/src/citadel.c @@ -88,7 +88,7 @@ long uglistlsn[UGLISTLEN]; /* current read position for all the ungoto's. Not go int uglistsize = 0; char is_mail = 0; /* nonzero when we're in a mail room */ char axlevel = AxDeleted; /* access level */ -char is_room_aide = 0; /* boolean flag, 1 if room aide */ +char is_room_aide = 0; /* boolean flag, 1 if room admin */ int timescalled; int posted; unsigned userflags; diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c index 8a65f85d9..c7e61bc49 100644 --- a/textclient/src/citadel_ipc.c +++ b/textclient/src/citadel_ipc.c @@ -87,8 +87,8 @@ char *axdefs[]={ "Local User", "Network User", "Preferred User", - "Aide", - "Sysop" + "Admin", + "Admin" }; diff --git a/textclient/src/rooms.c b/textclient/src/rooms.c index 732661e57..b58db20ae 100644 --- a/textclient/src/rooms.c +++ b/textclient/src/rooms.c @@ -501,7 +501,7 @@ int select_floor(CtdlIPC *ipc, int rfloor) void editthisroom(CtdlIPC *ipc) { int rbump = 0; - char raide[USERNAME_SIZE]; + char room_admin_name[USERNAME_SIZE]; char buf[SIZ]; struct ctdlroom *attr = NULL; struct ExpirePolicy *eptr = NULL; @@ -515,15 +515,15 @@ void editthisroom(CtdlIPC *ipc) } eptr = &(attr->QRep); - /* Fetch the name of the current room aide */ + /* Fetch the name of the current room admin */ r = CtdlIPCGetRoomAide(ipc, buf); if (r / 100 == 2) { - safestrncpy(raide, buf, sizeof raide); + safestrncpy(room_admin_name, buf, sizeof room_admin_name); } else { - strcpy(raide, ""); + strcpy(room_admin_name, ""); } - if (IsEmptyStr(raide)) { - strcpy(raide, "none"); + if (IsEmptyStr(room_admin_name)) { + strcpy(room_admin_name, "none"); } /* Fetch the expire policy (this will silently fail on old servers, @@ -616,14 +616,14 @@ void editthisroom(CtdlIPC *ipc) } attr->QRorder = intprompt("Listing order", attr->QRorder, 0, 127); - /* Ask about the room aide */ + /* Ask about the room admin */ do { - strprompt("Room aide (or 'none')", raide, 29); - if (!strcasecmp(raide, "none")) { - strcpy(raide, ""); + strprompt("Room admin (or 'none')", room_admin_name, 29); + if (!strcasecmp(room_admin_name, "none")) { + strcpy(room_admin_name, ""); break; } else { - r = CtdlIPCQueryUsername(ipc, raide, buf); + r = CtdlIPCQueryUsername(ipc, room_admin_name, buf); if (r / 100 != 2) scr_printf("%s\n", buf); } @@ -660,7 +660,7 @@ void editthisroom(CtdlIPC *ipc) scr_printf("Save changes (y/n)? "); if (yesno() == 1) { - r = CtdlIPCSetRoomAide(ipc, raide, buf); + r = CtdlIPCSetRoomAide(ipc, room_admin_name, buf); if (r / 100 != 2) { scr_printf("%s\n", buf); } @@ -1077,7 +1077,7 @@ void entroom(CtdlIPC *ipc) "<1>Public room (shown to all users by default)\n" "<2>Hidden room (accessible to anyone who knows the room name)\n" "<3>Passworded room (hidden, plus requires a password to enter)\n" - "<4>Invitation-only room (requires access to be granted by an Aide)\n" + "<4>Invitation-only room (requires access to be granted by an Admin)\n" "<5>Personal room (accessible to you only)\n" "Enter room type: " ); @@ -1133,19 +1133,19 @@ void entroom(CtdlIPC *ipc) void readinfo(CtdlIPC *ipc) { /* read info file for current room */ char buf[SIZ]; - char raide[64]; + char room_admin_name[64]; int r; /* IPC response code */ char *text = NULL; - /* Name of currernt room aide */ + /* Name of currernt room admin */ r = CtdlIPCGetRoomAide(ipc, buf); if (r / 100 == 2) - safestrncpy(raide, buf, sizeof raide); + safestrncpy(room_admin_name, buf, sizeof room_admin_name); else - strcpy(raide, ""); + strcpy(room_admin_name, ""); - if (!IsEmptyStr(raide)) - scr_printf("Room aide is %s.\n\n", raide); + if (!IsEmptyStr(room_admin_name)) + scr_printf("Room admin is %s.\n\n", room_admin_name); r = CtdlIPCRoomInfo(ipc, &text, buf); if (r / 100 != 1) diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c index 254f4e6bc..ed2b953c4 100644 --- a/textclient/src/tuiconfig.c +++ b/textclient/src/tuiconfig.c @@ -129,7 +129,7 @@ void do_system_configuration(CtdlIPC *ipc) "Allow anonymous guest logins", atoi(&sc[67][0])))); snprintf(sc[4], sizeof sc[4], "%d", (boolprompt( - "Automatically give room aide privs to a user who creates a private room", + "Automatically give room admin privs to a user who creates a private room", atoi(&sc[4][0])))); snprintf(sc[8], sizeof sc[8], "%d", (boolprompt( @@ -141,7 +141,7 @@ void do_system_configuration(CtdlIPC *ipc) "Restrict Internet mail to only those with that privilege", atoi(&sc[11][0])))); snprintf(sc[26], sizeof sc[26], "%d", (boolprompt( - "Allow Aides to Zap (forget) rooms", + "Allow admins to Zap (forget) rooms", atoi(&sc[26][0])))); if (!IsEmptyStr(&sc[18][0])) {