Completed a new queue (sieve_list) which will instantly

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index a0fd868800c9a33ccdfa414936eb50a149d0c94f..240cb55dc77a9cdadf862c76953541505117bf8d 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -503,7 +503,7 @@ int is_noneditable(struct ctdlroom *qrbuf)
 /*
  * Back-back-end for all room listing commands
  */
-void list_roomname(struct ctdlroom *qrbuf, int ra, int view)
+void list_roomname(struct ctdlroom *qrbuf, int ra, int current_view, int default_view)
 {
        char truncated_roomname[ROOMNAMELEN];
 
@@ -520,13 +520,15 @@ void list_roomname(struct ctdlroom *qrbuf, int ra, int view)
        }
 
        /* ...and now the other parameters */
-       cprintf("|%u|%d|%d|%d|%d|%d|\n",
+       cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n",
                qrbuf->QRflags,
                (int) qrbuf->QRfloor,
                (int) qrbuf->QRorder,
                (int) qrbuf->QRflags2,
                ra,
-               view
+               current_view,
+               default_view,
+               qrbuf->QRmtime
        );
 }
 
@@ -546,7 +548,7 @@ void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data)
        if ((( ra & (UA_KNOWN | UA_ZAPPED)))
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lrms(char *argbuf)
@@ -584,7 +586,7 @@ void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data)
        if ((( ra & (UA_KNOWN)))
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lkra(char *argbuf)
@@ -620,7 +622,7 @@ void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data)
                && ((qrbuf->QRflags & QR_MAILBOX) == 0)
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lprm(char *argbuf)
@@ -653,7 +655,7 @@ void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data)
            && (ra & UA_HASNEWMSGS)
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lkrn(char *argbuf)
@@ -692,7 +694,7 @@ void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data)
            && ((ra & UA_HASNEWMSGS) == 0)
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lkro(char *argbuf)
@@ -731,7 +733,7 @@ void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data)
            && (ra & UA_ZAPPED)
            && ((qrbuf->QRfloor == (FloorBeingSearched))
                || ((FloorBeingSearched) < 0)))
-               list_roomname(qrbuf, ra, view);
+               list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview);
 }
 
 void cmd_lzrm(char *argbuf)
@@ -1227,7 +1229,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                ret = crr_room_not_found;
        }
 
-       else if ( (CC->user.axlevel < 6)
+       else if ( (CC->user.axlevel < 6) && (!CC->internal_pgm)
                  && (CC->user.usernum != qrbuf.QRroomaide)
                  && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) )  {
                ret = crr_access_denied;
@@ -1605,7 +1607,7 @@ void delete_room(struct ctdlroom *qrbuf)
        /* Delete the messages in the room
         * (Careful: this opens an S_ROOMS critical section!)
         */
-       CtdlDeleteMessages(qrbuf->QRname, 0L, "", 0);
+       CtdlDeleteMessages(qrbuf->QRname, NULL, 0, "", 0);
 
        /* Flag the room record as not in use */
        lgetroom(qrbuf, qrbuf->QRname);
@@ -1648,7 +1650,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
                }
 
                /* Can't delete your Mail> room */
-               if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+               if (!strcasecmp(&qr->QRname[11], MAILROOM)) return(0);
 
                /* Otherwise it's ok */
                return(1);
@@ -1849,7 +1851,7 @@ void cmd_cre8(char *args)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (CC->user.axlevel < config.c_createax) {
+       if (CC->user.axlevel < config.c_createax || CC->internal_pgm) {
                cprintf("%d You need higher access to create rooms.\n",
                        ERROR + HIGHER_ACCESS_REQUIRED);
                return;