* Allow Aides to create rooms in other users' namespaces (if global access

  controls allow)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 62ee22e070ca95f945eff4acf9d22712037d3921..7f9d1d443bf80a720ae62a720fb163154c8e234d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 591.46  2002/06/16 21:01:11  ajc
+ * Allow Aides to create rooms in other users' namespaces (if global access
+   controls allow)
+
  Revision 591.45  2002/06/15 20:48:50  ajc
  * Fixed small bug in the e<X>pert mode toggle
 
@@ -3735,3 +3739,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 30ae45e1b55efb62b2ceebc12705801e52940748..b3ce16c4863ea866e591511811409f7c1577f22a 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1609,11 +1609,20 @@ void cmd_cre8(char *args)
                return;
        }
 
-       if ((new_room_type < 0) || (new_room_type > 4)) {
+       if ((new_room_type < 0) || (new_room_type > 5)) {
                cprintf("%d Invalid room type.\n", ERROR);
                return;
        }
 
+       if (new_room_type == 5) {
+               if ((config.c_aide_mailboxes == 0)
+                  || (CC->usersupp.axlevel < 6)) {
+                       cprintf("%d Higher access required\n", 
+                               ERROR+HIGHER_ACCESS_REQUIRED);
+                       return;
+               }
+       }
+
        /* 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);