* Changed the comments at the beginning of each file to a consistent format

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 2c4cfa7eb2ef28d3f5958f8c50370d8d10e488fd..c9c6b513689a4afebdaa584dfa261aba06300ae2 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1,4 +1,9 @@
-/* $Id$ */
+/* 
+ * $Id$
+ * 
+ * Server functions which perform operations on room objects.
+ *
+ */
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -443,10 +448,8 @@ void cmd_lrms(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -480,10 +483,8 @@ void cmd_lkra(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -519,10 +520,8 @@ void cmd_lkrn(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -558,10 +557,8 @@ void cmd_lkro(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -597,10 +594,8 @@ void cmd_lzrm(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -613,7 +608,7 @@ void cmd_lzrm(char *argbuf)
 
 
 
-void usergoto(char *where, int display_result)
+void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
 {
        int a;
        int new_messages = 0;
@@ -685,6 +680,11 @@ void usergoto(char *where, int display_result)
                strcpy(truncated_roomname, &truncated_roomname[11]);
        }
 
+       if (retmsgs != NULL) *retmsgs = total_messages;
+       if (retnew != NULL) *retnew = new_messages;
+       lprintf(9, "<%s> %d new of %d total messages\n",
+               CC->quickroom.QRname, new_messages, total_messages);
+
        if (display_result)
                cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
                        OK, CtdlCheckExpress(),
@@ -712,10 +712,7 @@ void cmd_goto(char *gargs)
        char towhere[256];
        char password[256];
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        extract(towhere, gargs, 0);
        extract(password, gargs, 1);
@@ -748,7 +745,7 @@ void cmd_goto(char *gargs)
 
                /* let internal programs go directly to any room */
                if (CC->internal_pgm) {
-                       usergoto(towhere, 1);
+                       usergoto(towhere, 1, NULL, NULL);
                        return;
                }
 
@@ -773,7 +770,7 @@ void cmd_goto(char *gargs)
                                   ((ra & UA_KNOWN) == 0)) {
                                goto NOPE;
                        } else {
-                               usergoto(towhere, 1);
+                               usergoto(towhere, 1, NULL, NULL);
                                return;
                        }
                }
@@ -788,17 +785,9 @@ void cmd_whok(void)
        struct usersupp temp;
        struct cdbdata *cdbus;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
        getuser(&CC->usersupp, CC->curr_user);
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
        cdb_rewind(CDB_USERSUPP);
        while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
@@ -826,10 +815,8 @@ void cmd_rdir(void)
        FILE *ls, *fd;
        struct stat statbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        getroom(&CC->quickroom, CC->quickroom.QRname);
        getuser(&CC->usersupp, CC->curr_user);
 
@@ -888,15 +875,7 @@ void cmd_rdir(void)
  */
 void cmd_getr(void)
 {
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
        /********
        if (is_noneditable(&CC->quickroom)) {
@@ -929,16 +908,7 @@ void cmd_setr(char *args)
        int new_order = 0;
        int ne = 0;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
-
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
        if (is_noneditable(&CC->quickroom)) {
                ne = 1;
@@ -1044,10 +1014,8 @@ void cmd_geta(void)
 {
        struct usersupp usbuf;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
@@ -1070,15 +1038,8 @@ void cmd_seta(char *new_ra)
        char buf[256];
        int post_notice;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (getuser(&usbuf, new_ra) != 0) {
                newu = (-1L);
        } else {
@@ -1160,7 +1121,7 @@ void delete_room(struct quickroom *qrbuf)
        /* Delete the messages in the room
         * (Careful: this opens an S_QUICKROOM critical section!)
         */
-       CtdlDeleteMessages(qrbuf->QRname, 0L, NULL);
+       CtdlDeleteMessages(qrbuf->QRname, 0L, "");
 
        /* Flag the room record as not in use */
        lgetroom(qrbuf, qrbuf->QRname);
@@ -1188,15 +1149,8 @@ void cmd_kill(char *argbuf)
 
        kill_ok = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
@@ -1204,7 +1158,7 @@ void cmd_kill(char *argbuf)
        if (kill_ok) {
                strcpy(deleted_room_name, CC->quickroom.QRname);
                delete_room(&CC->quickroom);    /* Do the dirty work */
-               usergoto(BASEROOM, 0);  /* Return to the Lobby */
+               usergoto(BASEROOM, 0, NULL, NULL); /* Return to the Lobby */
 
                /* tell the world what we did */
                sprintf(aaa, "%s> killed by %s\n",
@@ -1329,10 +1283,7 @@ void cmd_cre8(char *args)
                }
        }
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        if (CC->usersupp.axlevel < config.c_createax) {
                cprintf("%d You need higher access to create rooms.\n",
@@ -1402,15 +1353,8 @@ void cmd_einf(char *ok)
        char infofilename[256];
        char buf[256];
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (atoi(ok) == 0) {
                cprintf("%d Ok.\n", OK);
                return;
@@ -1448,15 +1392,7 @@ void cmd_lflr(void)
        int a;
        struct floor flbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       /* if (getuser(&CC->usersupp,CC->curr_user)) {
-          cprintf("%d Can't locate user!\n",ERROR+INTERNAL_ERROR);
-          return;
-          }
-        */
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        cprintf("%d Known floors:\n", LISTING_FOLLOWS);
 
@@ -1489,15 +1425,8 @@ void cmd_cflr(char *argbuf)
        cflr_ok = extract_int(argbuf, 1);
 
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to create rooms.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_aide)) return;
+
        for (a = 0; a < MAXFLOORS; ++a) {
                getfloor(&flbuf, a);
 
@@ -1548,16 +1477,8 @@ void cmd_kflr(char *argbuf)
        floor_to_delete = extract_int(argbuf, 0);
        kflr_ok = extract_int(argbuf, 1);
 
+       if (CtdlAccessCheck(ac_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to delete floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        lgetfloor(&flbuf, floor_to_delete);
 
        delete_ok = 1;
@@ -1601,15 +1522,9 @@ void cmd_eflr(char *argbuf)
                cprintf("%d Usage error.\n", ERROR);
                return;
        }
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to edit floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+
+       if (CtdlAccessCheck(ac_aide)) return;
+
        floor_num = extract_int(argbuf, 0);
        lgetfloor(&flbuf, floor_num);
        if ((flbuf.f_flags & F_INUSE) == 0) {