cmd_invt_kick() is normally permitted when the room namespace matches the user number...

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 8b833a3cdd8d7b58974d152735114462be304073..989ce41b9ddfdd8c4d953b6a2d1fa4dbcf8d1986 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -739,7 +739,7 @@ void do_login(void)
        CtdlCreateRoom(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
-       /* CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); temporarily disabled for 7.60 */
+       CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
 
        /* Run any startup routines registered by loadable modules */
        PerformSessionHooks(EVT_LOGIN);
@@ -1106,8 +1106,6 @@ int internal_create_user (const char *username, long len, struct ctdluser *usbuf
        usbuf->timescalled = 0;
        usbuf->posted = 0;
        usbuf->axlevel = config.c_initax;
-       usbuf->USscreenwidth = 80;
-       usbuf->USscreenheight = 24;
        usbuf->lastcall = time(NULL);
 
        /* fetch a new user number */
@@ -1412,12 +1410,10 @@ void cmd_getu(char *cmdbuf)
                return;
 
        CtdlGetUser(&CC->user, CC->curr_user);
-       cprintf("%d %d|%d|%d|\n",
+       cprintf("%d 80|24|%d|\n",
                CIT_OK,
-               CC->user.USscreenwidth,
-               CC->user.USscreenheight,
                (CC->user.flags & US_USER_SET)
-           );
+       );
 }
 
 /*
@@ -1433,12 +1429,8 @@ void cmd_setu(char *new_parms)
                return;
        }
        CtdlGetUserLock(&CC->user, CC->curr_user);
-       CC->user.USscreenwidth = extract_int(new_parms, 0);
-       CC->user.USscreenheight = extract_int(new_parms, 1);
        CC->user.flags = CC->user.flags & (~US_USER_SET);
-       CC->user.flags = CC->user.flags |
-           (extract_int(new_parms, 2) & US_USER_SET);
-
+       CC->user.flags = CC->user.flags | (extract_int(new_parms, 2) & US_USER_SET);
        CtdlPutUserLock(&CC->user);
        cprintf("%d Ok\n", CIT_OK);
 }
@@ -1565,8 +1557,9 @@ void cmd_invt_kick(char *iuser, int op) {
         * These commands are only allowed by aides, room aides,
         * and room namespace owners
         */
-       if (is_room_aide()
-          || (atol(CC->room.QRname) == CC->user.usernum) ) {
+       if (is_room_aide()) {
+               /* access granted */
+       } else if ( ((atol(CC->room.QRname) == CC->user.usernum) ) && (CC->user.usernum != 0) ) {
                /* access granted */
        } else {
                /* access denied */