]> code.citadel.org Git - citadel.git/blobdiff - citadel/user_ops.c
Changeover to new room structure. See ChangeLog for details.
[citadel.git] / citadel / user_ops.c
index 65de3d3299759932f5598041abf134db8226cc8c..4efd6b7f0c2e488a9441693f6889ed697cf9d78d 100644 (file)
@@ -2,6 +2,8 @@
 #define _XOPEN_SOURCE
 /* needed for str[n]casecmp() on some systems if the above is defined */
 #define _XOPEN_SOURCE_EXTENDED
+/* needed to enable threads on some systems if the above are defined */
+#define _POSIX_C_SOURCE 199506L
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -13,6 +15,7 @@
 #include <sys/time.h>
 #include <string.h>
 #include <syslog.h>
+#include <limits.h>
 #include <pthread.h>
 #include "citadel.h"
 #include "server.h"
@@ -27,6 +30,7 @@
 #include "msgbase.h"
 #include "config.h"
 #include "dynloader.h"
+#include "sysdep.h"
 
 
 /*
@@ -192,7 +196,12 @@ void CtdlGetRelationship(struct visit *vbuf,
        
        free(visits);
        }
-       
+
+
+void MailboxName(char *buf, struct usersupp *who, char *prefix) {
+       sprintf(buf, "%010ld.%s", who->usernum, prefix);
+       }
+
        
 /*
  * Is the user currently logged in an Aide?
@@ -293,9 +302,6 @@ void cmd_user(char *cmdbuf)
  * session startup code which is common to both cmd_pass() and cmd_newu()
  */
 void session_startup(void) {
-       int a;
-       struct quickroom qr;
-
        syslog(LOG_NOTICE,"user <%s> logged in",CC->curr_user);
 
        lgetuser(&CC->usersupp,CC->curr_user);
@@ -314,17 +320,6 @@ void session_startup(void) {
                CC->usersupp.axlevel = 6;
                }
 
- /******************************************************************************/
- /* FIX  It is safe to remove this segment during the cutover                  */
-       for (a=0; a<MAXROOMS; ++a) {
-               getroom(&qr,a);
-               if (CC->usersupp.generation[a] != qr.QRgen)
-                                       CC->usersupp.generation[a]=(-1);
-               if (CC->usersupp.forget[a] != qr.QRgen)
-                                       CC->usersupp.forget[a]=(-1);
-               }
- /******************************************************************************/
-
        lputuser(&CC->usersupp,CC->curr_user);
 
         /* Run any cleanup routines registered by loadable modules */
@@ -333,7 +328,7 @@ void session_startup(void) {
        cprintf("%d %s|%d|%d|%d|%u|%ld\n",OK,CC->usersupp.fullname,CC->usersupp.axlevel,
                CC->usersupp.timescalled,CC->usersupp.posted,CC->usersupp.flags,
                CC->usersupp.usernum);
-       usergoto(0,0);          /* Enter the lobby */   
+       usergoto(BASEROOM,0);           /* Enter the lobby */   
        rec_log(CL_LOGIN,CC->curr_user);
        }
 
@@ -471,6 +466,7 @@ int create_user(char *newusername)
        int a;
        struct passwd *p = NULL;
        char username[64];
+       char mailboxname[ROOMNAMELEN];
 
        strcpy(username, newusername);
        strproc(username);
@@ -498,15 +494,6 @@ int create_user(char *newusername)
        strcpy(CC->usersupp.password,"");
        (CC->logged_in) = 1;
 
-       /********************************************************/
-       /* FIX this can safely be removed during the cutover... */
-       for (a=0; a<MAXROOMS; ++a) {
-               CC->usersupp.lastseen[a]=0L;
-               CC->usersupp.generation[a]=(-1);
-               CC->usersupp.forget[a]=(-1);
-               }
-       /********************************************************/
-
        /* These are the default flags on new accounts */
        CC->usersupp.flags =
                US_NEEDVALID|US_LASTOLD|US_DISAPPEAR|US_PAGINATOR|US_FLOORS;
@@ -536,6 +523,11 @@ int create_user(char *newusername)
        if (getuser(&CC->usersupp,CC->curr_user)) {
                return(ERROR+INTERNAL_ERROR);
                }
+       
+       /* give the user a private mailbox */
+       MailboxName(mailboxname, &CC->usersupp, MAILROOM);
+       create_room(mailboxname, 4, "", 0);
+
        rec_log(CL_NEWUSER,CC->curr_user);
        return(0);
        }
@@ -680,16 +672,8 @@ void cmd_slrp(char *new_ptr)
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
        if (!strncasecmp(new_ptr,"highest",7)) {
                newlr = CC->quickroom.QRhighest;
-/* FIX ... if the current room is 1 (Mail), newlr needs to be set to the
- * number of the highest mail message
- */
                }
        else {
                newlr = atol(new_ptr);
@@ -697,10 +681,6 @@ void cmd_slrp(char *new_ptr)
 
        lgetuser(&CC->usersupp, CC->curr_user);
 
-       /* old method - remove */
-       CC->usersupp.lastseen[CC->curr_rm] = newlr;
-
-       /* new method */
        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
        vbuf.v_lastseen = newlr;
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
@@ -725,11 +705,6 @@ void cmd_invt_kick(char *iuser, int op)
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
        if (is_room_aide()==0) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
@@ -751,21 +726,11 @@ void cmd_invt_kick(char *iuser, int op)
        CtdlGetRelationship(&vbuf, &USscratch, &CC->quickroom);
 
        if (op==1) {
-               /* old method -- FIX remove this when we're ready */
-               USscratch.generation[CC->curr_rm]=CC->quickroom.QRgen;
-               USscratch.forget[CC->curr_rm]=(-1);
-
-               /* new method */
                vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
                }
 
        if (op==0) {
-               /* old method -- FIX remove this when we're ready */
-               USscratch.generation[CC->curr_rm]=(-1);
-               USscratch.forget[CC->curr_rm]=CC->quickroom.QRgen;
-
-               /* new method */
                vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
                vbuf.v_flags = vbuf.v_flags | V_FORGET | V_LOCKOUT;
                }
@@ -803,16 +768,6 @@ void cmd_forg(void) {
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
-       if (CC->curr_rm < 3) {
-               cprintf("%d You cannot forget this room.\n",ERROR+NOT_HERE);
-               return;
-               }
-
        if (is_aide()) {
                cprintf("%d Aides cannot forget rooms.\n",ERROR);
                return;
@@ -821,17 +776,12 @@ void cmd_forg(void) {
        lgetuser(&CC->usersupp,CC->curr_user);
        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
-       /* old method -- FIX remove this when we're ready */
-       CC->usersupp.forget[CC->curr_rm] = CC->quickroom.QRgen;
-       CC->usersupp.generation[CC->curr_rm] = (-1);
-
-       /* new method */
        vbuf.v_flags = vbuf.v_flags | V_FORGET;
 
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
        lputuser(&CC->usersupp,CC->curr_user);
        cprintf("%d Ok\n",OK);
-       CC->curr_rm = (-1);
+       usergoto(BASEROOM, 0);
        }
 
 /*
@@ -1342,14 +1292,22 @@ int NewMailCount() {
        int num_mails;
        long *mailbox;
        int a;
+       char mailboxname[32];
+
+       MailboxName(mailboxname, &CC->usersupp, MAILROOM);
+       for (a=0; a<=strlen(mailboxname); ++a) {
+               mailboxname[a] = tolower(mailboxname[a]);
+               }
 
-       cdbmb = cdb_fetch(CDB_MAILBOXES, &CC->usersupp.usernum, sizeof(long));
+       cdbmb = cdb_fetch(CDB_MAILBOXES, mailboxname, strlen(mailboxname));
        if (cdbmb != NULL) {
                num_mails = cdbmb->len / sizeof(long);
                mailbox = (long *) cdbmb->ptr;
                if (num_mails > 0) for (a=0; a<num_mails; ++a) {
-                       if (mailbox[a] > (CC->usersupp.lastseen[1]))
+                       /*
+                       if (message is new FIX FIX FIX)
                                ++num_newmsgs;
+                       */
                        }
                cdb_free(cdbmb);
                }