Changing the name of the 'Aide' access level to 'Admin'

diff --git a/citadel/axdefs.h b/citadel/axdefs.h
index bb23fd9ae1797b5b4d05984feea314f18b71d25d..e92f74171cc8a371c7090334cb85ba3afdee88bd 100644 (file)
--- a/citadel/axdefs.h
+++ b/citadel/axdefs.h
@@ -7,9 +7,9 @@ char *axdefs[]={
        "Local User",
        "Network User",
        "Preferred User",
        "Local User",
        "Network User",
        "Preferred User",

-       "Aide",
-       "Sysop"
-       };
+       "Admin",
+       "Admin"
+};

 
 #define AXDEFS 1
 
 
 #define AXDEFS 1
 

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 7e5538b51817757f789466066e61edda741c518e..42208a7da3d4bee36a9274d6619a316f181010ce 100644 (file)
--- 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) {
 
        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) {
                        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);
        }
                        ERROR + HIGHER_ACCESS_REQUIRED);
                return(-1);
        }

diff --git a/citadel/help/aide b/citadel/help/aide
index 38d535521eccefa2e72913e32fb0b74e590658cb..0a084db7ece1ed5ceefe1ce29998caf1e73c3d34 100644 (file)
--- 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.
 
 commands are available to room aides when they are currently in the room
 they are room aide for.
 

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

  
  In addition, the <M>ove and <D>elete commands are available at the
 message prompt.
  
  In addition, the <M>ove and <D>elete commands are available at the
 message prompt.

diff --git a/citadel/help/intro b/citadel/help/intro
index bf3e3cd7fb1cad5b061dfbad69eaa13e0a542683..2d3c336eb1fd03b92494be225d0e71213a54a4ec 100644 (file)
--- a/citadel/help/intro
+++ b/citadel/help/intro
@@ -1,5 +1,5 @@
                      Welcome to ^humannode!
                      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
   
  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.
    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-<Z>appable, so you can be sure that the
 person will get the message.
    
 on the scanlist, and is un-<Z>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
 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
  
    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 <Z>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 <Z>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!
  
 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. 
  
 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
 amount of trust, due to the additional privileges granted.
  
  Citadel messages

diff --git a/citadel/help/summary b/citadel/help/summary
index 83d3c5c7c7061ba343d1974e47a0ef98400d3a82..bc075919f4473d4342a12f460dddb8abf5a9290f 100644 (file)
--- 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)
  <.> <W>holist <H>ostname         Masquerade your host name
                                   see the name you enter rather than the
                                   actual name of the room you're in)
  <.> <W>holist <H>ostname         Masquerade your host name

- <.> <E>nter <U>sername           Masquerade your user name (Aides only)
+ <.> <E>nter <U>sername           Masquerade your user name (Admins only)

  <.> <W>holist <S>tealth mode     Enter/exit "stealth mode" (when in stealth
                                   mode you are invisible on the wholist)
  
  <.> <W>holist <S>tealth mode     Enter/exit "stealth mode" (when in stealth
                                   mode you are invisible on the wholist)
  


@@ -90,21 +90,21 @@ commands are available:
  ;<Z>ap floor                       - zap (forget) all rooms on this floor
  
  
  ;<Z>ap floor                       - zap (forget) all rooms on this floor
  
  

- Aide (administrative) commands: 
+ Administrative commands: 

  
  

- <.> <A>ide <K>ill this room   
- <.> <A>ide <E>dit this room   
- <.> <A>ide <W>ho knows room   
- <.> <A>ide edit <U>ser   
- <.> <A>ide <V>alidate new users   
- <.> <A>ide enter <I>nfo file   
- <.> <A>ide <R>oom <I>nvite user  
- <.> <A>ide <R>oom <K>ick out user  
- <.> <A>ide <F>ile <D>elete  
- <.> <A>ide <F>ile <S>end over net  
- <.> <A>ide <F>ile <M>ove  
- <.> <A>ide <M>essage edit:   
- <.> <A>ide <P>ost   
- <.> <A>ide <S>ystem configuration   
- <.> <A>ide <T>erminate server <N>ow
- <.> <A>ide <T>erminate server <S>cheduled
+ <.> <A>dmin <K>ill this room   
+ <.> <A>dmin <E>dit this room   
+ <.> <A>dmin <W>ho knows room   
+ <.> <A>dmin edit <U>ser   
+ <.> <A>dmin <V>alidate new users   
+ <.> <A>dmin enter <I>nfo file   
+ <.> <A>dmin <R>oom <I>nvite user  
+ <.> <A>dmin <R>oom <K>ick out user  
+ <.> <A>dmin <F>ile <D>elete  
+ <.> <A>dmin <F>ile <S>end over net  
+ <.> <A>dmin <F>ile <M>ove  
+ <.> <A>dmin <M>essage edit:   
+ <.> <A>dmin <P>ost   
+ <.> <A>dmin <S>ystem configuration   
+ <.> <A>dmin <T>erminate server <N>ow
+ <.> <A>dmin <T>erminate server <S>cheduled

diff --git a/citadel/messages/roomaccess b/citadel/messages/roomaccess
index 4dabb9605577d6ecbb1d39c88a22e7c0b72d6708..0aebbac56fe7327a1ddd5a9ab28a901037f1169a 100644 (file)
--- 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
 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
  
  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
 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?
  
  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 abb47ca161e0c8767c62bd323faff5690eefb1e0..4af4355cb2a6b0922f78ee3d17c6505785419d81 100644 (file)
--- 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);
 
        /* 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! */
        if (who->axlevel >= AxAideU) return(3);
 
        /* No mail for you! */


@@ -4920,7 +4920,7 @@ void cmd_move(char *args)
         */
        permit = 0;
 
         */
        permit = 0;
 

-       /* Aides can move/copy */
+       /* Admins can move/copy */

        if (CC->user.axlevel >= AxAideU) permit = 1;
 
        /* Room aides 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 3f08b0105c27029ff44fab71af7cc84695196422..1e4209bdc6867bccc3a8b9e10ed9b1d15d2bb99b 100644 (file)
--- 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)
 {
  */
 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)
 {
  */
 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)
 {
  */
 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)
 {
  */
 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,
        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,
                                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);
                                CC->room.QRname);

-               CtdlAideMessage(buf, "Aide Room Modification");
+               CtdlAideMessage(buf, "Admin Room Modification");

        }
        cprintf("%d Ok\n", CIT_OK);
 }
        }
        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());
 }
 
 /*
         */
        return(is_room_aide());
 }
 
 /*

- * aide command: kill the current room
+ * admin command: kill the current room

  */
 void cmd_kill(char *argbuf)
 {
  */
 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
        }
 
        /* 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;
        }
         */
        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;
        }
         * (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);
         */
        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_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");
                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 b6663cdb051e4048332b8ec9290a51baebeaa34b..e414917b07f690ecce8f4e5f4e90d3702299aec0 100644 (file)
--- 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
  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
 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 f7cb7493870456c61d6eed7434531ce9849e5b35..fd8056559c4ba479eaec5eb8570c63ebf11ca47c 100644 (file)
--- 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)
 {
  */
 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)
 {
  */
 int is_room_aide(void)
 {


@@ -1589,7 +1589,7 @@ int CtdlInvtKick(char *iuser, int op) {
 void cmd_invt_kick(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()) {
         * 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;
 
 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);
        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 ca1072afd81d6b2d5b03b1fc85c6ef74a28cb115..f1f0004e68a89f865d0e5a08154552f86c85e98f 100644 (file)
--- 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.
 
 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.
 
 
 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 03364a0baa1f96ea87543a59e585d2ea0f2fea21..f4a540e3d5f31622ff5accd95570d5049e53e163 100644 (file)
--- 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_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     */
 #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_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 */
 #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 899da07b892bf3ce64d9c6b2ee9f5fd58a659429..e979e6489acf46e3955b41a8f97e9b99dd3cf25a 100644 (file)
--- 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,
 
 # 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.
 # 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 -*-
 
 
 # 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.
 
 #
 # 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/../..'.
 # 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 351f5b57c79cfbf92e572ea59821d00200e1dad6..cdf46c9e141db2a3c5fb21ab1bb776e0523d3c95 100644 (file)
--- 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.
 #
 # 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
 # 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=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
 
 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=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
 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 3b958891e5874983b54521467d1f00cca6b3780b..d5f187c3d45fcbf1226312184b281a0dd663ed68 100644 (file)
--- 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 */
 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;
 int timescalled;
 int posted;
 unsigned userflags;

diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c
index 8a65f85d92c92d92f0d9006c24f3cef0dba69789..c7e61bc4978ca43ab1c6903f6bd6395b92a3db08 100644 (file)
--- a/textclient/src/citadel_ipc.c
+++ b/textclient/src/citadel_ipc.c
@@ -87,8 +87,8 @@ char *axdefs[]={
         "Local User",
         "Network User",
         "Preferred User",
         "Local User",
         "Network User",
         "Preferred User",

-        "Aide",
-        "Sysop"
+        "Admin",
+        "Admin"

         };
 
 
         };
 
 

diff --git a/textclient/src/rooms.c b/textclient/src/rooms.c
index 732661e5783b8568a4941c8d6a65509f78f87b78..b58db20ae57142d20088c478e498562d3cdae5cb 100644 (file)
--- 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;
 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;
        char buf[SIZ];
        struct ctdlroom *attr = NULL;
        struct ExpirePolicy *eptr = NULL;


@@ -515,15 +515,15 @@ void editthisroom(CtdlIPC *ipc)
        }
        eptr = &(attr->QRep);
 
        }
        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) {
        r = CtdlIPCGetRoomAide(ipc, buf);
        if (r / 100 == 2) {

-               safestrncpy(raide, buf, sizeof raide);
+               safestrncpy(room_admin_name, buf, sizeof room_admin_name);

        } else {
        } 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,
        }
 
        /* 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);
 
        }
        attr->QRorder = intprompt("Listing order", attr->QRorder, 0, 127);
 

-       /* Ask about the room aide */
+       /* Ask about the room admin */

        do {
        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 {
                        break;
                } else {

-                       r = CtdlIPCQueryUsername(ipc, raide, buf);
+                       r = CtdlIPCQueryUsername(ipc, room_admin_name, buf);

                        if (r / 100 != 2)
                                scr_printf("%s\n", 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) {
        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);
                }
                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"
                        "<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: "
                );
                        "<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];
 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;
 
        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)
        r = CtdlIPCGetRoomAide(ipc, buf);
        if (r / 100 == 2)

-               safestrncpy(raide, buf, sizeof raide);
+               safestrncpy(room_admin_name, buf, sizeof room_admin_name);

        else
        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)
 
        r = CtdlIPCRoomInfo(ipc, &text, buf);
        if (r / 100 != 1)

diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c
index 254f4e6bca7f3242129bf76a4ba8be6e818f2857..ed2b953c4a5ae2dca13d67e75d2ea650b1b80e3f 100644 (file)
--- 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(
                "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(
                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(
                "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])) {
                atoi(&sc[26][0]))));
 
        if (!IsEmptyStr(&sc[18][0])) {