]> code.citadel.org Git - citadel.git/commitdiff
* Finished moving vCard functionality to the new message base functions.
authorArt Cancro <ajc@citadel.org>
Sat, 23 Oct 1999 03:39:12 +0000 (03:39 +0000)
committerArt Cancro <ajc@citadel.org>
Sat, 23 Oct 1999 03:39:12 +0000 (03:39 +0000)
citadel/ChangeLog
citadel/citserver.c
citadel/msgbase.c
citadel/routines2.c
citadel/serv_vcard.c

index a286e807a7effb2b468ba9f29721aaae036cb246..eb66d5ae8ec8aa9df5f11291767c16d0bf0cc8f3 100644 (file)
@@ -1,4 +1,7 @@
 $Log$
+Revision 1.392  1999/10/23 03:39:12  ajc
+* Finished moving vCard functionality to the new message base functions.
+
 Revision 1.391  1999/10/21 00:50:14  ajc
 * Finished up the flags and replication checks in CtdlSaveMsgPointerInRoom().
 
@@ -1340,4 +1343,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-
index 30ba3800f0ef405ac77a2a25cef145a393af1f3f..31d8c0782bd5bd48025a8f6b791f31687f93f598 100644 (file)
@@ -561,6 +561,9 @@ void GenerateRoomDisplay(char *real_room,
                        struct CitContext *viewer) {
 
        strcpy(real_room, viewed->quickroom.QRname);
+       if (viewed->quickroom.QRflags & QR_MAILBOX) {
+               strcpy(real_room, &real_room[11]);
+       }
        if (viewed->quickroom.QRflags & QR_PRIVATE) {
                if ( (CtdlRoomAccess(&viewed->quickroom, &viewer->usersupp)
                   & UA_KNOWN) == 0) {
index a0c0a857e97a6b9b87dcea211ef56add76274215..5296502a522555db995d0ff46743691d4a7ec212 100644 (file)
@@ -101,8 +101,6 @@ int alias(char *name)
        int a, b;
        char aaa[300], bbb[300];
 
-       lprintf(9, "alias() called for <%s>\n", name);
-
        remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 
        fp = fopen("network/mail.aliases", "r");
@@ -635,7 +633,6 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum)
 
        dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
        if (dmsgtext == NULL) {
-               lprintf(9, "CtdlFetchMessage(%ld) failed.\n");
                return NULL;
        }
        mptr = dmsgtext->ptr;
@@ -1097,6 +1094,7 @@ void cmd_opna(char *cmdbuf)
 /*
  * Save a message pointer into a specified room
  * (Returns 0 for success, nonzero for failure)
+ * roomname may be NULL to use the current room
  */
 int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
        int i;
@@ -1120,6 +1118,26 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
                if (msg == NULL) return(ERROR + ILLEGAL_VALUE);
        }
 
+       /* Perform replication checks if necessary */
+       if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) {
+
+               if (getroom(&CC->quickroom,
+                  ((roomname != NULL) ? roomname : CC->quickroom.QRname) )
+                  != 0) {
+                       lprintf(9, "No such room <%s>\n", roomname);
+                       if (msg != NULL) CtdlFreeMessage(msg);
+                       return(ERROR + ROOM_NOT_FOUND);
+               }
+
+               if (ReplicationChecks(msg) != 0) {
+                       getroom(&CC->quickroom, hold_rm);
+                       if (msg != NULL) CtdlFreeMessage(msg);
+                       lprintf(9, "Did replication, and newer exists\n");
+                       return(0);
+               }
+       }
+
+       /* Now the regular stuff */
        if (lgetroom(&CC->quickroom,
           ((roomname != NULL) ? roomname : CC->quickroom.QRname) )
           != 0) {
@@ -1155,17 +1173,6 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
                }
        }
 
-       /* Perform replication checks if necessary */
-       if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) {
-               if (ReplicationChecks(msg) != 0) {
-                       lputroom(&CC->quickroom);       /* unlock the room */
-                       getroom(&CC->quickroom, hold_rm);
-                       if (msg != NULL) CtdlFreeMessage(msg);
-                       lprintf(9, "Did replication, and newer exists\n");
-                       return(0);
-               }
-       }
-
         /* Now add the new message */
         ++num_msgs;
         msglist = reallok(msglist,
@@ -1198,7 +1205,6 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
        AdjRefCount(msgid, +1);
 
        /* Return success. */
-       lprintf(9, "CtdlSaveMsgPointerInRoom() succeeded\n");
        if (msg != NULL) CtdlFreeMessage(msg);
         return (0);
 }
@@ -1281,19 +1287,13 @@ void serialize_message(struct ser_ret *ret,             /* return values */
        int i;
        static char *forder = FORDER;
 
-       lprintf(9, "serialize_message() called\n");
-
        if (is_valid_message(msg) == 0) return;         /* self check */
 
-       lprintf(9, "magic number check OK.\n");
-
        ret->len = 3;
        for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL)
                ret->len = ret->len +
                        strlen(msg->cm_fields[(int)forder[i]]) + 2;
 
-       lprintf(9, "message is %d bytes\n", ret->len);
-
        lprintf(9, "calling malloc\n");
        ret->ser = mallok(ret->len);
        if (ret->ser == NULL) {
@@ -1306,7 +1306,6 @@ void serialize_message(struct ser_ret *ret,               /* return values */
        ret->ser[2] = msg->cm_format_type;
        wlen = 3;
 
-       lprintf(9, "stuff\n");
        for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
                ret->ser[wlen++] = (char)forder[i];
                strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
@@ -1314,7 +1313,6 @@ void serialize_message(struct ser_ret *ret,               /* return values */
        }
        if (ret->len != wlen) lprintf(3, "ERROR: len=%d wlen=%d\n",
                ret->len, wlen);
-       lprintf(9, "done serializing\n");
 
        return;
 }
@@ -1384,7 +1382,7 @@ int ReplicationChecks(struct CtdlMessage *msg) {
                }
 
        CtdlFreeMessage(template);
-       lprintf(9, "Returning %d\n", abort_this);
+       lprintf(9, "ReplicationChecks() returning %d\n", abort_this);
        return(abort_this);
 }
 
@@ -1475,6 +1473,26 @@ void CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
                }
        }
 
+       /* Goto the correct room */
+       strcpy(hold_rm, CC->quickroom.QRname);
+       strcpy(actual_rm, CC->quickroom.QRname);
+
+       /* If the user is a twit, move to the twit room for posting */
+       if (TWITDETECT) {
+               if (CC->usersupp.axlevel == 2) {
+                       strcpy(hold_rm, actual_rm);
+                       strcpy(actual_rm, config.c_twitroom);
+               }
+       }
+
+       /* ...or if this message is destined for Aide> then go there. */
+       if (strlen(force_room) > 0) {
+               strcpy(actual_rm, force_room);
+       }
+
+       if (strcasecmp(actual_rm, CC->quickroom.QRname))
+               getroom(&CC->quickroom, actual_rm);
+
        /* Perform "before save" hooks (aborting if any return nonzero) */
        if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return;
 
@@ -1512,24 +1530,12 @@ void CtdlSaveMsg(struct CtdlMessage *msg,       /* message to save */
 
        /* Now figure out where to store the pointers */
 
-       strcpy(actual_rm, CC->quickroom.QRname);
 
        /* If this is being done by the networker delivering a private
         * message, we want to BYPASS saving the sender's copy (because there
         * is no local sender; it would otherwise go to the Trashcan).
         */
        if ((!CC->internal_pgm) || (strlen(recipient) == 0)) {
-               /* If the user is a twit, move to the twit room for posting */
-               if (TWITDETECT) {
-                       if (CC->usersupp.axlevel == 2) {
-                               strcpy(hold_rm, actual_rm);
-                               strcpy(actual_rm, config.c_twitroom);
-                       }
-               }
-               /* ...or if this message is destined for Aide> then go there. */
-               if (strlen(force_room) > 0) {
-                       strcpy(actual_rm, force_room);
-               }
                CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
        }
 
@@ -1550,6 +1556,10 @@ void CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
 
        /* Perform "after save" hooks */
        PerformMessageHooks(msg, EVT_AFTERSAVE);
+
+       /* */
+       if (strcasecmp(hold_rm, CC->quickroom.QRname))
+               getroom(&CC->quickroom, hold_rm);
 }
 
 
index e3ea568606b9f796bc9fb84cb2081b84a6142787..77f740b5c4c92940cf2e8a6233fabab8c17d399e 100644 (file)
@@ -36,7 +36,7 @@ int inkey(void);
 void serv_write(char *buf, int nbytes);
 int haschar(char *st, int ch);
 void progress(long int curr, long int cmax);
-void citedit(FILE *fp, long int base_pos);
+void citedit(FILE * fp, long int base_pos);
 int yesno(void);
 
 extern char temp[];
@@ -51,28 +51,31 @@ extern int screenwidth;
 int eopen(char *name, int mode)
 {
        int ret;
-       ret = open(name,mode);
-       if (ret<0) {
-               fprintf(stderr,"Cannot open file '%s', mode=%d, errno=%d\n",
-                       name,mode,errno);
+       ret = open(name, mode);
+       if (ret < 0) {
+               fprintf(stderr, "Cannot open file '%s', mode=%d, errno=%d\n",
+                       name, mode, errno);
                interr(errno);
-               }
-       return(ret);
        }
+       return (ret);
+}
 
 
-int room_prompt(int qrflags)   /* return proper room prompt character */
-             {
+int room_prompt(int qrflags)
+{                              /* return proper room prompt character */
        int a;
-       a='>';
-       if (qrflags&QR_DIRECTORY) a=']';
-       if ((a==']')&&(qrflags&QR_NETWORK)) a='}';
-       if ((a=='>')&&(qrflags&QR_NETWORK)) a=')';
-       return(a);
-       }
-
-void entregis(void)    /* register with name and address */
-       {
+       a = '>';
+       if (qrflags & QR_DIRECTORY)
+               a = ']';
+       if ((a == ']') && (qrflags & QR_NETWORK))
+               a = '}';
+       if ((a == '>') && (qrflags & QR_NETWORK))
+               a = ')';
+       return (a);
+}
+
+void entregis(void)
+{                              /* register with name and address */
 
        char buf[256];
        char tmpname[256];
@@ -84,45 +87,51 @@ void entregis(void) /* register with name and address */
        char tmpemail[256];
        int a;
 
-       strcpy(tmpname,"");
-       strcpy(tmpaddr,"");
-       strcpy(tmpcity,"");
-       strcpy(tmpstate,"");
-       strcpy(tmpzip,"");
-       strcpy(tmpphone,"");
-       strcpy(tmpemail,"");
+       strcpy(tmpname, "");
+       strcpy(tmpaddr, "");
+       strcpy(tmpcity, "");
+       strcpy(tmpstate, "");
+       strcpy(tmpzip, "");
+       strcpy(tmpphone, "");
+       strcpy(tmpemail, "");
 
        serv_puts("GREG _SELF_");
        serv_gets(buf);
-       if (buf[0]=='1') {
+       if (buf[0] == '1') {
                a = 0;
-               while (serv_gets(buf), strcmp(buf,"000")) {
-                       if (a==2) strcpy(tmpname,buf);
-                       if (a==3) strcpy(tmpaddr,buf);
-                       if (a==4) strcpy(tmpcity,buf);
-                       if (a==5) strcpy(tmpstate,buf);
-                       if (a==6) strcpy(tmpzip,buf);
-                       if (a==7) strcpy(tmpphone,buf);
-                       if (a==9) strcpy(tmpemail,buf);
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (a == 2)
+                               strcpy(tmpname, buf);
+                       if (a == 3)
+                               strcpy(tmpaddr, buf);
+                       if (a == 4)
+                               strcpy(tmpcity, buf);
+                       if (a == 5)
+                               strcpy(tmpstate, buf);
+                       if (a == 6)
+                               strcpy(tmpzip, buf);
+                       if (a == 7)
+                               strcpy(tmpphone, buf);
+                       if (a == 9)
+                               strcpy(tmpemail, buf);
                        ++a;
-                       }
                }
-
-       strprompt("REAL name",tmpname,29);
-       strprompt("Address",tmpaddr,24);
-       strprompt("City/town",tmpcity,14);
-       strprompt("State",tmpstate,2);
-       strprompt("ZIP Code",tmpzip,10);
-       strprompt("Telephone number",tmpphone,14);
-       strprompt("Email address",tmpemail,31);
+       }
+       strprompt("REAL name", tmpname, 29);
+       strprompt("Address", tmpaddr, 24);
+       strprompt("City/town", tmpcity, 14);
+       strprompt("State", tmpstate, 2);
+       strprompt("ZIP Code", tmpzip, 10);
+       strprompt("Telephone number", tmpphone, 14);
+       strprompt("Email address", tmpemail, 31);
 
        /* now send the registration info back to the server */
        serv_puts("REGI");
        serv_gets(buf);
-       if (buf[0]!='4') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '4') {
+               printf("%s\n", &buf[4]);
                return;
-               }
+       }
        serv_puts(tmpname);
        serv_puts(tmpaddr);
        serv_puts(tmpcity);
@@ -132,28 +141,36 @@ void entregis(void)       /* register with name and address */
        serv_puts(tmpemail);
        serv_puts("000");
        printf("\n");
-       }
+}
 
-void updatels(void) {  /* make all messages old in current room */
+void updatels(void)
+{                              /* make all messages old in current room */
        char buf[256];
        serv_puts("SLRP HIGHEST");
        serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
-       }
+       if (buf[0] != '2')
+               printf("%s\n", &buf[4]);
+}
 
-void updatelsa(void) {   /* only make messages old in this room that have been read */
+/*
+ * only make messages old in this room that have been read
+ */
+void updatelsa(void)
+{
        char buf[256];
-       sprintf(buf,"SLRP %ld",highest_msg_read);
+       sprintf(buf, "SLRP %ld", highest_msg_read);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
-       }
+       if (buf[0] != '2')
+               printf("%s\n", &buf[4]);
+}
 
 
 /*
  * This routine completes a client upload
  */
-void do_upload(int fd) {
+void do_upload(int fd)
+{
        char buf[256];
        char tbuf[4096];
        long transmitted_bytes, total_bytes;
@@ -161,41 +178,41 @@ void do_upload(int fd) {
        int bytes_expected;
 
        /* learn the size of the file */
-       total_bytes = lseek(fd,0L,2);
-       lseek(fd,0L,0);
+       total_bytes = lseek(fd, 0L, 2);
+       lseek(fd, 0L, 0);
 
        transmitted_bytes = 0L;
-       progress(transmitted_bytes,total_bytes);
+       progress(transmitted_bytes, total_bytes);
        do {
-               bytes_to_send = read(fd,tbuf,4096);
-               if (bytes_to_send>0) {
-                       sprintf(buf,"WRIT %d",bytes_to_send);
+               bytes_to_send = read(fd, tbuf, 4096);
+               if (bytes_to_send > 0) {
+                       sprintf(buf, "WRIT %d", bytes_to_send);
                        serv_puts(buf);
                        serv_gets(buf);
-                       if (buf[0]=='7') {
+                       if (buf[0] == '7') {
                                bytes_expected = atoi(&buf[4]);
-                               serv_write(tbuf,bytes_expected);
-                               }
-                       else {
-                               printf("%s\n",&buf[4]);
-                               }
+                               serv_write(tbuf, bytes_expected);
+                       } else {
+                               printf("%s\n", &buf[4]);
                        }
-               transmitted_bytes = transmitted_bytes + (long)bytes_to_send;
+               }
+               transmitted_bytes = transmitted_bytes + (long) bytes_to_send;
                progress(transmitted_bytes, total_bytes);
-               } while (bytes_to_send > 0);
+       } while (bytes_to_send > 0);
 
        /* close the upload file, locally and at the server */
        close(fd);
        serv_puts("UCLS 1");
        serv_gets(buf);
-       printf("%s\n",&buf[4]);
-       }
+       printf("%s\n", &buf[4]);
+}
 
 
 /*
  * client-based uploads (for users with their own clientware)
  */
-void cli_upload(void) {
+void cli_upload(void)
+{
        char flnm[256];
        char desc[151];
        char buf[256];
@@ -206,41 +223,44 @@ void cli_upload(void) {
        if ((room_flags & QR_UPLOAD) == 0) {
                printf("*** You cannot upload to this room.\n");
                return;
-               }
-
-       newprompt("File to be uploaded: ",flnm,55);
-       fd = open(flnm,O_RDONLY);
-       if (fd<0) {
-               printf("Cannot open '%s': %s\n",flnm,strerror(errno));
+       }
+       newprompt("File to be uploaded: ", flnm, 55);
+       fd = open(flnm, O_RDONLY);
+       if (fd < 0) {
+               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
-               }
+       }
        printf("Enter a description of this file:\n");
-       newprompt(": ",desc,75);
+       newprompt(": ", desc, 75);
 
        /* keep generating filenames in hope of finding a unique one */
        a = 0;
        do {
-               if (a==10) return; /* fail if tried 10 times */
-               strcpy(buf,flnm);
-               while ((strlen(buf)>0)&&(haschar(buf,'/')))
-                       strcpy(buf,&buf[1]);
-               if (a>0) sprintf(&buf[strlen(buf)],"%d",a);
-               sprintf(tbuf,"UOPN %s|%s",buf,desc);
+               if (a == 10)
+                       return; /* fail if tried 10 times */
+               strcpy(buf, flnm);
+               while ((strlen(buf) > 0) && (haschar(buf, '/')))
+                       strcpy(buf, &buf[1]);
+               if (a > 0)
+                       sprintf(&buf[strlen(buf)], "%d", a);
+               sprintf(tbuf, "UOPN %s|%s", buf, desc);
                serv_puts(tbuf);
                serv_gets(buf);
-               if (buf[0]!='2') printf("%s\n",&buf[4]);
+               if (buf[0] != '2')
+                       printf("%s\n", &buf[4]);
                ++a;
-               } while (buf[0]!='2');
+       } while (buf[0] != '2');
 
        /* at this point we have an open upload file at the server */
        do_upload(fd);
-       }
+}
 
 
 /*
  * Function used for various image upload commands
  */
-void cli_image_upload(char *keyname) {
+void cli_image_upload(char *keyname)
+{
        char flnm[256];
        char buf[256];
        int fd;
@@ -251,149 +271,148 @@ void cli_image_upload(char *keyname) {
        if (buf[0] != '2') {
                printf("%s\n", &buf[4]);
                return;
-               }
-
-       newprompt("Image file to be uploaded: ",flnm,55);
-       fd = open(flnm,O_RDONLY);
-       if (fd<0) {
-               printf("Cannot open '%s': %s\n",flnm,strerror(errno));
+       }
+       newprompt("Image file to be uploaded: ", flnm, 55);
+       fd = open(flnm, O_RDONLY);
+       if (fd < 0) {
+               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
-               }
-
+       }
        sprintf(buf, "UIMG 1|%s", keyname);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
                printf("%s\n", &buf[4]);
                return;
-               }
-
-       do_upload(fd);
        }
+       do_upload(fd);
+}
 
 
 /*
  * protocol-based uploads (Xmodem, Ymodem, Zmodem)
  */
-void upload(int c)     /* c = upload mode */
-       {
+void upload(int c)
+{                              /* c = upload mode */
        char flnm[256];
        char desc[151];
        char buf[256];
        char tbuf[4096];
        int xfer_pid;
-       int a,b;
-       FILE *fp,*lsfp;
+       int a, b;
+       FILE *fp, *lsfp;
        int fd;
 
        if ((room_flags & QR_UPLOAD) == 0) {
                printf("*** You cannot upload to this room.\n");
                return;
-               }
-
+       }
        /* we don't need a filename when receiving batch y/z modem */
-       if ((c==2)||(c==3)) strcpy(flnm,"x");
-       else newprompt("Enter filename: ",flnm,15);
+       if ((c == 2) || (c == 3))
+               strcpy(flnm, "x");
+       else
+               newprompt("Enter filename: ", flnm, 15);
 
-       for (a=0; a<strlen(flnm); ++a)
-               if ( (flnm[a]=='/') || (flnm[a]=='\\') || (flnm[a]=='>')
-                    || (flnm[a]=='?') || (flnm[a]=='*')
-                    || (flnm[a]==';') || (flnm[a]=='&') ) flnm[a]='_';
+       for (a = 0; a < strlen(flnm); ++a)
+               if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
+                   || (flnm[a] == '?') || (flnm[a] == '*')
+                   || (flnm[a] == ';') || (flnm[a] == '&'))
+                       flnm[a] = '_';
 
-       newprompt("Enter a short description of the file:\n: ",desc,150);
+       newprompt("Enter a short description of the file:\n: ", desc, 150);
 
        /* create a temporary directory... */
-       if (mkdir(tempdir,0700) != 0) {
+       if (mkdir(tempdir, 0700) != 0) {
                printf("*** Could not create temporary directory %s: %s\n",
-                       tempdir,strerror(errno));
+                      tempdir, strerror(errno));
                return;
-               }
-
+       }
        /* now do the transfer ... in a separate process */
        xfer_pid = fork();
        if (xfer_pid == 0) {
-           chdir(tempdir);
-           switch(c) {
-               case 0:
+               chdir(tempdir);
+               switch (c) {
+               case 0:
                        sttybbs(0);
-                       printf("Receiving %s - press Ctrl-D to end.\n",flnm);
-                       fp = fopen(flnm,"w");
+                       printf("Receiving %s - press Ctrl-D to end.\n", flnm);
+                       fp = fopen(flnm, "w");
                        do {
-                               b=inkey(); 
-                               if (b==13) {
-                                       b=10; printf("\r");
-                                       }
-                               if (b!=4) {
-                                       printf("%c",b);
-                                       putc(b,fp);
-                                       }
-                               } while(b!=4);
+                               b = inkey();
+                               if (b == 13) {
+                                       b = 10;
+                                       printf("\r");
+                               }
+                               if (b != 4) {
+                                       printf("%c", b);
+                                       putc(b, fp);
+                               }
+                       } while (b != 4);
                        fclose(fp);
                        exit(0);
-               case 1:
+               case 1:
                        sttybbs(3);
-                       execlp("rx","rx",flnm,NULL);
+                       execlp("rx", "rx", flnm, NULL);
                        exit(1);
-               case 2:
+               case 2:
                        sttybbs(3);
-                       execlp("rb","rb",NULL);
+                       execlp("rb", "rb", NULL);
                        exit(1);
-               case 3:
+               case 3:
                        sttybbs(3);
-                       execlp("rz","rz",NULL);
+                       execlp("rz", "rz", NULL);
                        exit(1);
-                       }
                }
-       else do {
-               b=ka_wait(&a);
-               } while ((b!=xfer_pid)&&(b!=(-1)));
+       } else
+               do {
+                       b = ka_wait(&a);
+               } while ((b != xfer_pid) && (b != (-1)));
        sttybbs(0);
 
        if (a != 0) {
                printf("\r*** Transfer unsuccessful.\n");
                nukedir(tempdir);
                return;
-               }
-
+       }
        printf("\r*** Transfer successful.  Sending file(s) to server...\n");
-       sprintf(buf,"cd %s; ls",tempdir);
-       lsfp = popen(buf,"r");
-       if (lsfp!=NULL) {
-               while (fgets(flnm,256,lsfp)!=NULL) {
-                       flnm[strlen(flnm)-1] = 0;
-                       sprintf(buf,"%s/%s",tempdir,flnm);
-                       fd = open(buf,O_RDONLY);
-                       if (fd>=0) {
+       sprintf(buf, "cd %s; ls", tempdir);
+       lsfp = popen(buf, "r");
+       if (lsfp != NULL) {
+               while (fgets(flnm, 256, lsfp) != NULL) {
+                       flnm[strlen(flnm) - 1] = 0;
+                       sprintf(buf, "%s/%s", tempdir, flnm);
+                       fd = open(buf, O_RDONLY);
+                       if (fd >= 0) {
                                a = 0;
                                do {
-                                       sprintf(buf,"UOPN %s|%s",flnm,desc);
-                                       if (a>0) sprintf(&buf[strlen(buf)],
-                                               ".%d",a);
+                                       sprintf(buf, "UOPN %s|%s", flnm, desc);
+                                       if (a > 0)
+                                               sprintf(&buf[strlen(buf)],
+                                                       ".%d", a);
                                        ++a;
                                        serv_puts(buf);
                                        serv_gets(buf);
-                                       } while((buf[0]!='2')&&(a<100));
-                               if (buf[0]=='2') do {
-                                       a=read(fd,tbuf,4096);
-                                       if (a>0) {
-                                               sprintf(buf,"WRIT %d",a);
-                                               serv_puts(buf);
-                                               serv_gets(buf);
-                                               if (buf[0]=='7')
-                                                       serv_write(tbuf,a);
+                               } while ((buf[0] != '2') && (a < 100));
+                               if (buf[0] == '2')
+                                       do {
+                                               a = read(fd, tbuf, 4096);
+                                               if (a > 0) {
+                                                       sprintf(buf, "WRIT %d", a);
+                                                       serv_puts(buf);
+                                                       serv_gets(buf);
+                                                       if (buf[0] == '7')
+                                                               serv_write(tbuf, a);
                                                }
-                                       } while (a>0);
+                                       } while (a > 0);
                                close(fd);
                                serv_puts("UCLS 1");
                                serv_gets(buf);
-                               printf("%s\n",&buf[4]);
-                               }
+                               printf("%s\n", &buf[4]);
                        }
-               pclose(lsfp);
                }
-
-       nukedir(tempdir);
+               pclose(lsfp);
        }
+       nukedir(tempdir);
+}
 
 /* 
  * validate a user
@@ -408,41 +427,52 @@ void val_user(char *user, int do_validate)
        sprintf(cmd, "GREG %s", user);
        serv_puts(cmd);
        serv_gets(cmd);
-       if (cmd[0]=='1') {
+       if (cmd[0] == '1') {
                a = 0;
                do {
                        serv_gets(buf);
                        ++a;
-                       if (a==1) printf("User #%s - %s  ", buf, &cmd[4]);
-                       if (a==2) printf("PW: %s\n",buf);
-                       if (a==3) printf("%s\n",buf);
-                       if (a==4) printf("%s\n",buf);
-                       if (a==5) printf("%s, ",buf);
-                       if (a==6) printf("%s ",buf);
-                       if (a==7) printf("%s\n",buf);
-                       if (a==8) printf("%s\n",buf);
-                       if (a==9) ax=atoi(buf);
-                       if (a==10) printf("%s\n",buf);
-                       } while(strcmp(buf,"000"));
-               printf("Current access level: %d (%s)\n",ax,axdefs[ax]);
-               }
-       else {
-               printf("%-30s\n%s\n",user,&cmd[4]);
-               }
+                       if (a == 1)
+                               printf("User #%s - %s  ", buf, &cmd[4]);
+                       if (a == 2)
+                               printf("PW: %s\n", buf);
+                       if (a == 3)
+                               printf("%s\n", buf);
+                       if (a == 4)
+                               printf("%s\n", buf);
+                       if (a == 5)
+                               printf("%s, ", buf);
+                       if (a == 6)
+                               printf("%s ", buf);
+                       if (a == 7)
+                               printf("%s\n", buf);
+                       if (a == 8)
+                               printf("%s\n", buf);
+                       if (a == 9)
+                               ax = atoi(buf);
+                       if (a == 10)
+                               printf("%s\n", buf);
+               } while (strcmp(buf, "000"));
+               printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
+       } else {
+               printf("%-30s\n%s\n", user, &cmd[4]);
+       }
 
        if (do_validate) {
                /* now set the access level */
                ax = intprompt("Access level", ax, 0, 6);
-               sprintf(cmd,"VALI %s|%d",user,ax);
+               sprintf(cmd, "VALI %s|%d", user, ax);
                serv_puts(cmd);
                serv_gets(cmd);
-               if (cmd[0]!='2') printf("%s\n",&cmd[4]);
-               }
-       printf("\n");
+               if (cmd[0] != '2')
+                       printf("%s\n", &cmd[4]);
        }
+       printf("\n");
+}
 
 
-void validate(void) {  /* validate new users */
+void validate(void)
+{                              /* validate new users */
        char cmd[256];
        char buf[256];
        int finished = 0;
@@ -450,136 +480,149 @@ void validate(void) {   /* validate new users */
        do {
                serv_puts("GNUR");
                serv_gets(cmd);
-               if (cmd[0]!='3') finished = 1;
-               if (cmd[0]=='2') printf("%s\n",&cmd[4]);
-               if (cmd[0]=='3') {
+               if (cmd[0] != '3')
+                       finished = 1;
+               if (cmd[0] == '2')
+                       printf("%s\n", &cmd[4]);
+               if (cmd[0] == '3') {
                        extract(buf, cmd, 0);
                        val_user(&buf[4], 1);
-                       }
-               } while(finished==0);
-       }
+               }
+       } while (finished == 0);
+}
 
-void subshell(void) {
-       int a,b;
-       a=fork();
-       if (a==0) {
+void subshell(void)
+{
+       int a, b;
+       a = fork();
+       if (a == 0) {
                sttybbs(SB_RESTORE);
-               signal(SIGINT,SIG_DFL);
-               signal(SIGQUIT,SIG_DFL);
-               execlp(getenv("SHELL"),getenv("SHELL"),NULL);
+               signal(SIGINT, SIG_DFL);
+               signal(SIGQUIT, SIG_DFL);
+               execlp(getenv("SHELL"), getenv("SHELL"), NULL);
                printf("Could not open a shell: %s\n", strerror(errno));
                exit(errno);
-               }
+       }
        do {
-               b=ka_wait(NULL);
-               } while ((a!=b)&&(a!=(-1)));
+               b = ka_wait(NULL);
+       } while ((a != b) && (a != (-1)));
        sttybbs(0);
-       }
+}
 
 /*
  * <.A>ide <F>ile <D>elete command
  */
-void deletefile(void) {
+void deletefile(void)
+{
        char filename[32];
        char cmd[256];
 
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       sprintf(cmd,"DELF %s",filename);
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       sprintf(cmd, "DELF %s", filename);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       printf("%s\n", &cmd[4]);
+}
 
 /*
  * <.A>ide <F>ile <S>end command
  */
-void netsendfile(void) {
-       char filename[32],destsys[20],cmd[256];
+void netsendfile(void)
+{
+       char filename[32], destsys[20], cmd[256];
 
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       newprompt("System to send to: ",destsys,19);
-       sprintf(cmd,"NETF %s|%s",filename,destsys);
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("System to send to: ", destsys, 19);
+       sprintf(cmd, "NETF %s|%s", filename, destsys);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
+       printf("%s\n", &cmd[4]);
        return;
-       }
+}
 
 /*
  * <.A>ide <F>ile <M>ove command
  */
-void movefile(void) {
+void movefile(void)
+{
        char filename[64];
        char newroom[ROOMNAMELEN];
        char cmd[256];
 
-       newprompt("Filename: ",filename,63);
-       if (strlen(filename)==0) return;
-       newprompt("Enter target room: ",newroom,ROOMNAMELEN-1);
+       newprompt("Filename: ", filename, 63);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
 
-       sprintf(cmd,"MOVF %s|%s",filename,newroom);
+       sprintf(cmd, "MOVF %s|%s", filename, newroom);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       printf("%s\n", &cmd[4]);
+}
 
 
 /* 
  * list of users who have filled out a bio
  */
-void list_bio(void) {
+void list_bio(void)
+{
        char buf[256];
        int pos = 1;
 
        serv_puts("LBIO");
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               printf("%s\n", &buf[4]);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               if ((pos+strlen(buf)+5)>screenwidth) {
+       }
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               if ((pos + strlen(buf) + 5) > screenwidth) {
                        printf("\n");
                        pos = 1;
-                       }
-               printf("%s, ",buf);
-               pos = pos + strlen(buf) + 2;
                }
-       printf("%c%c  \n\n",8,8);
+               printf("%s, ", buf);
+               pos = pos + strlen(buf) + 2;
        }
+       printf("%c%c  \n\n", 8, 8);
+}
 
 
 /*
  * read bio
  */
-void read_bio(void) {
+void read_bio(void)
+{
        char who[256];
        char buf[256];
 
        do {
-               newprompt("Read bio for who ('?' for list) : ",who,25);
+               newprompt("Read bio for who ('?' for list) : ", who, 25);
                printf("\n");
-               if (!strcmp(who,"?")) list_bio();
-               } while(!strcmp(who,"?"));
-       sprintf(buf,"RBIO %s",who);
+               if (!strcmp(who, "?"))
+                       list_bio();
+       } while (!strcmp(who, "?"));
+       sprintf(buf, "RBIO %s", who);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               printf("%s\n", &buf[4]);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               printf("%s\n",buf);
-               }
        }
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               printf("%s\n", buf);
+       }
+}
 
 
 /* 
  * General system configuration command
  */
-void do_system_configuration(void) {
+void do_system_configuration(void)
+{
        char buf[256];
        char sc[21][256];
        int expire_mode = 0;
@@ -595,48 +638,47 @@ void do_system_configuration(void) {
        if (buf[0] == '1') {
                a = 0;
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       if (a<21) strcpy(&sc[a][0], buf);
+                       if (a < 21)
+                               strcpy(&sc[a][0], buf);
                        ++a;
-                       }
                }
-
+       }
        /* Fetch the expire policy (this will silently fail on old servers,
         * resulting in "default" policy)
         */
        serv_puts("GPEX site");
        serv_gets(buf);
-       if (buf[0]=='2') {
+       if (buf[0] == '2') {
                expire_mode = extract_int(&buf[4], 0);
                expire_value = extract_int(&buf[4], 1);
-               }
-
+       }
        strprompt("Node name", &sc[0][0], 15);
        strprompt("Fully qualified domain name", &sc[1][0], 63);
        strprompt("Human readable node name", &sc[2][0], 20);
        strprompt("Modem dialup number", &sc[3][0], 15);
 
        sprintf(&sc[4][0], "%d", (boolprompt(
-               "Automatically give room aide privs to a user who creates a private room",
-               atoi(&sc[4][0]))));
+                                                   "Automatically give room aide privs to a user who creates a private room",
+                                                   atoi(&sc[4][0]))));
 
        strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
        strprompt("Initial access level for new users", &sc[6][0], 1);
        strprompt("Access level required to create rooms", &sc[19][0], 1);
 
        sprintf(&sc[7][0], "%d", (boolprompt(
-               "Require registration for new users",
-               atoi(&sc[7][0]))));
+                                   "Require registration for new users",
+                                                   atoi(&sc[7][0]))));
 
        sprintf(&sc[8][0], "%d", (boolprompt(
-               "Automatically move problem user messages to twit room",
-               atoi(&sc[8][0]))));
+                "Automatically move problem user messages to twit room",
+                                                   atoi(&sc[8][0]))));
 
        strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
        strprompt("Paginator prompt", &sc[10][0], 79);
 
        sprintf(&sc[11][0], "%d", (boolprompt(
-               "Restrict Internet mail to only those with that privilege",
-               atoi(&sc[11][0]))));
+             "Restrict Internet mail to only those with that privilege",
+                                                    atoi(&sc[11][0]))));
 
        strprompt("Geographic location of this system", &sc[12][0], 31);
        strprompt("Name of system administrator", &sc[13][0], 25);
@@ -651,14 +693,14 @@ void do_system_configuration(void) {
        do {
                sprintf(buf, "%d", expire_mode);
                strprompt("System default message expire policy (? for list)",
-                       buf, 1);
+                         buf, 1);
                if (buf[0] == '?') {
                        printf("\n");
                        printf("1. Never automatically expire messages\n");
                        printf("2. Expire by message count\n");
                        printf("3. Expire by message age\n");
-                       }
-               } while((buf[0]<49)||(buf[0]>51));
+               }
+       } while ((buf[0] < 49) || (buf[0] > 51));
        expire_mode = buf[0] - 48;
 
        /* ...lunatics and monsters underneath my bed */
@@ -666,27 +708,25 @@ void do_system_configuration(void) {
                sprintf(buf, "%d", expire_value);
                strprompt("Keep how many messages online?", buf, 10);
                expire_value = atol(buf);
-               }
-
+       }
        if (expire_mode == 3) {
                sprintf(buf, "%d", expire_value);
                strprompt("Keep messages for how many days?", buf, 10);
                expire_value = atol(buf);
-               }
-
+       }
        /* Save it */
        printf("Save this configuration? ");
        if (yesno()) {
                serv_puts("CONF set");
                serv_gets(buf);
                if (buf[0] == '4') {
-                       for (a=0; a<21; ++a) serv_puts(&sc[a][0]);
+                       for (a = 0; a < 21; ++a)
+                               serv_puts(&sc[a][0]);
                        serv_puts("000");
-                       }
-
+               }
                snprintf(buf, sizeof buf, "SPEX site|%d|%d",
-                       expire_mode, expire_value);
+                        expire_mode, expire_value);
                serv_puts(buf);
                serv_gets(buf);
-               }
        }
+}
index 6f3fb55d1dc8ee2b545c2e21ebc946272acc341b..6c3d523ec39fc7f968184c8223cdf1d0d94ce492 100644 (file)
@@ -53,14 +53,6 @@ unsigned long SYM_VCARD;
 #define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
 
 
-/*
- * back end function used for callbacks
- */
-void vcard_gm_backend(long msgnum) {
-       VC->msgnum = msgnum;
-}
-
-
 /*
  * This handler detects whether the user is attempting to save a new
  * vCard as part of his/her personal configuration, and handles the replace
@@ -70,7 +62,6 @@ void vcard_gm_backend(long msgnum) {
 int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
-        char hold_rm[ROOMNAMELEN];
         char config_rm[ROOMNAMELEN];
        char buf[256];
 
@@ -92,32 +83,22 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                         * delete the old one.
                         */
 
-                       strcpy(hold_rm, CC->quickroom.QRname);  /* save rm */
+                       /* Delete the user's old vCard.  This would probably
+                        * get taken care of by the replication check, but we
+                        * want to make sure there is absolutely only one
+                        * vCard in the user's config room at all times.
+                        * 
+                        * FIX ... this needs to be tweaked to allow an admin
+                        * to make changes to another user's vCard instead of
+                        * assuming that it's always the user saving his own.
+                        */
                        MailboxName(config_rm, &CC->usersupp, CONFIGROOM);
-
-                       if (getroom(&CC->quickroom, config_rm) != 0) {
-                               getroom(&CC->quickroom, hold_rm);
-                               return(1);                      /* abort */
-                       }
-                       VC->msgnum = (-1L);
-                       CtdlForEachMessage(MSGS_ALL, 0,
-                               "text/x-vcard", NULL, vcard_gm_backend);
-
-                       if (VC->msgnum >= 0) {
-                               if (msg->cm_fields['Z'] != NULL)
-                                       phree(msg->cm_fields['Z']);
-                               sprintf(buf, "%ld@%s", VC->msgnum, NODENAME);
-                               msg->cm_fields['Z'] = strdoop(buf);
-                       }
-
                        CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
 
-                       getroom(&CC->quickroom, hold_rm);       /* return rm */
-
-
-                       /* This will do better */
-
-                        if (msg->cm_fields['E'] != NULL) /* Free any old E */
+                       /* Set the Extended-ID to a standardized one so the
+                        * replication always works correctly
+                        */
+                        if (msg->cm_fields['E'] != NULL)
                                 phree(msg->cm_fields['E']);
 
                         sprintf(buf,
@@ -125,7 +106,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                                 msg->cm_fields['A'], NODENAME);
                         msg->cm_fields['E'] = strdoop(buf);
 
-
+                       /* Now allow the save to complete. */
                        return(0);
                }
 
@@ -170,8 +151,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        I = atol(msg->cm_fields['I']);
                        if (I < 0L) return(0);
 
-                       /* FIX */
-
+                       CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
+                               (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
 
                        return(0);
                }
@@ -185,6 +166,14 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
 
 
+/*
+ * back end function used for callbacks
+ */
+void vcard_gu_backend(long msgnum) {
+       VC->msgnum = msgnum;
+}
+
+
 /*
  * If this user has a vcard on disk, read it into memory, otherwise allocate
  * and return an empty vCard.
@@ -206,7 +195,7 @@ struct vCard *vcard_get_user(struct usersupp *u) {
         /* We want the last (and probably only) vcard in this room */
        VC->msgnum = (-1);
         CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
-               NULL, vcard_gm_backend);
+               NULL, vcard_gu_backend);
         getroom(&CC->quickroom, hold_rm);      /* return to saved room */
 
        if (VC->msgnum < 0L) return vcard_new();
@@ -275,7 +264,6 @@ void cmd_regi(char *argbuf) {
        char tmpcity[256];
        char tmpstate[256];
        char tmpzip[256];
-       char tmpphone[256];
        char tmpaddress[512];
 
        if (!(CC->logged_in)) {
@@ -305,17 +293,7 @@ void cmd_regi(char *argbuf) {
                                        }
                                }
                        }
-               if (a==5) {
-                       strcpy(tmpphone, "");
-                       for (c=0; c<strlen(buf); ++c) {
-                               if ((buf[c]>='0')&&(buf[c]<='9')) {
-                                       b=strlen(tmpphone);
-                                       tmpphone[b]=buf[c];
-                                       tmpphone[b+1]=0;
-                                       }
-                               }
-                       vcard_set_prop(my_vcard, "tel;home", tmpphone);
-                       }
+               if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
                if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
                ++a;
                }