fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index f3598b4e98b28bdff269cdb6bba6ad09e5e23bd0..4ba90922c19d2528fade3063a2af1ab511688c74 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -10,7 +10,18 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <errno.h>
 #include "citadel.h"
@@ -113,7 +124,7 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
        }
 
 NEWMSG:        /* By the way, we also check for the presence of new messages */
-       if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+       if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
                retval = retval | UA_HASNEWMSGS;
        }
        return (retval);
@@ -698,7 +709,7 @@ void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
        if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
                if (msglist[a] > 0L) {
                        ++total_messages;
-                       if (msglist[a] > vbuf.v_lastseen) {
+                       if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
                                ++new_messages;
                        }
                }
@@ -801,7 +812,8 @@ void cmd_goto(char *gargs)
                if (ok == 1) {
                        if ((QRscratch.QRflags & QR_PASSWORDED) &&
                            ((ra & UA_KNOWN) == 0) &&
-                           (strcasecmp(QRscratch.QRpasswd, password))
+                           (strcasecmp(QRscratch.QRpasswd, password)) &&
+                           (CC->usersupp.axlevel < 6)
                            ) {
                                cprintf("%d wrong or missing passwd\n",
                                        ERROR + PASSWORD_REQUIRED);
@@ -809,7 +821,9 @@ void cmd_goto(char *gargs)
                        } else if ((QRscratch.QRflags & QR_PRIVATE) &&
                                   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
                                   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
-                                  ((ra & UA_KNOWN) == 0)) {
+                                  ((ra & UA_KNOWN) == 0) &&
+                                  (CC->usersupp.axlevel < 6)
+                                  ) {
                                goto NOPE;
                        } else {
                                usergoto(towhere, 1, NULL, NULL);
@@ -1187,6 +1201,49 @@ void delete_room(struct quickroom *qrbuf)
 }
 
 
+
+/*
+ * Check access control for deleting a room
+ */
+int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) {
+
+       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
+               return(0);
+       }
+
+       if (is_noneditable(qr)) {
+               return(0);
+       }
+
+       /*
+        * For mailboxes, check stuff
+        */
+       if (qr->QRflags & QR_MAILBOX) {
+
+               if (strlen(qr->QRname) < 12) return(0); /* bad name */
+
+               if (atol(qr->QRname) != CC->usersupp.usernum) {
+                       return(0);      /* not my room */
+               }
+
+               /* Can't delete your Mail> room */
+               if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+
+               /* Otherwise it's ok */
+               return(1);
+       }
+
+       /*
+        * For normal rooms, just check for aide or room aide status.
+        */
+       else {
+               return(is_room_aide());
+       }
+
+       /* Should never get to this point, but to keep the compiler quiet... */
+       return(0);
+}
+
 /*
  * aide command: kill the current room
  */
@@ -1198,10 +1255,8 @@ void cmd_kill(char *argbuf)
 
        kill_ok = extract_int(argbuf, 0);
 
-       if (CtdlAccessCheck(ac_room_aide)) return;
-
-       if (is_noneditable(&CC->quickroom)) {
-               cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
+       if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom) == 0) {
+               cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
                return;
        }
        if (kill_ok) {
@@ -1223,7 +1278,8 @@ void cmd_kill(char *argbuf)
 /*
  * Internal code to create a new room (returns room flags)
  *
- * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only, 4=mailbox
+ * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only,
+ *              4=mailbox, 5=mailbox, but caller supplies namespace
  */
 unsigned create_room(char *new_room_name,
                     int new_room_type,
@@ -1252,7 +1308,7 @@ unsigned create_room(char *new_room_name,
                qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
        if (new_room_type == 2)
                qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
-       if (new_room_type == 4)
+       if ( (new_room_type == 4) || (new_room_type == 5) )
                qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
 
        /* If the user is requesting a personal room, set up the room
@@ -1281,7 +1337,11 @@ unsigned create_room(char *new_room_name,
         */
        if (!really_create) return (qrbuf.QRflags);
 
-       cdb_begin_transaction();
+       /* cdb_begin_transaction();  commented out because a transaction
+          is already open when creating __CtdlSMTPspoolout__ while
+          initializing serv_smtp.c
+        */
+
        qrbuf.QRnumber = get_new_room_number();
        qrbuf.QRhighest = 0L;   /* No messages in this room yet */
        time(&qrbuf.QRgen);     /* Use a timestamp as the generation number */
@@ -1304,7 +1364,7 @@ unsigned create_room(char *new_room_name,
        lputuser(&CC->usersupp);
 
        /* resume our happy day */
-       cdb_end_transaction();
+       /* cdb_end_transaction(); */
        return (qrbuf.QRflags);
 }