]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_vcard.c
* Create a "Contacts" room for personal address book use
[citadel.git] / citadel / serv_vcard.c
index eec9670aceb1f9e35656eedca2fe6f0e5dde03e0..443783172a31781ffeb00da5022a9802a9373a32 100644 (file)
@@ -3,11 +3,26 @@
  * 
  * A server-side module for Citadel which supports address book information
  * using the standard vCard format.
- *
+ * 
+ * Copyright (c) 1999-2002 / released under the GNU General Public License
  */
 
+/*
+ * Where we keep messages containing the vCards that source our directory.  It
+ * makes no sense to change this, because you'd have to change it on every
+ * system on the network.  That would be stupid.
+ */
 #define ADDRESS_BOOK_ROOM      "Global Address Book"
 
+/*
+ * Format of the "Extended ID" field of the message containing a user's
+ * vCard.  Doesn't matter what it really looks like as long as it's both
+ * unique and consistent (because we use it for replication checking to
+ * delete the old vCard network-wide when the user enters a new one).
+ */
+#define VCARD_EXT_FORMAT       "Citadel vCard: personal card for %s at %s"
+
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/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 <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
 #include "control.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
 #include "database.h"
 #include "msgbase.h"
+#include "internet_addressing.h"
 #include "tools.h"
 #include "vcard.h"
 
@@ -43,10 +69,181 @@ struct vcard_internal_info {
 };
 
 /* Message number symbol used internally by these functions */
-unsigned long SYM_VCARD;
 #define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
 
 
+/*
+ * set global flag calling for an aide to validate new users
+ */
+void set_mm_valid(void) {
+       begin_critical_section(S_CONTROL);
+       get_control();
+       CitControl.MMflags = CitControl.MMflags | MM_VALID ;
+       put_control();
+       end_critical_section(S_CONTROL);
+}
+
+
+
+/*
+ * Extract Internet e-mail addresses from a message containing a vCard, and
+ * perform a callback for any found.
+ */
+void vcard_extract_internet_addresses(struct CtdlMessage *msg,
+                               void (*callback)(char *, char *) ) {
+       struct vCard *v;
+       char *s;
+       char *addr;
+       char citadel_address[SIZ];
+       int instance = 0;
+       int found_something = 0;
+
+       if (msg->cm_fields['A'] == NULL) return;
+       if (msg->cm_fields['N'] == NULL) return;
+       snprintf(citadel_address, sizeof citadel_address, "%s @ %s",
+               msg->cm_fields['A'], msg->cm_fields['N']);
+
+       v = vcard_load(msg->cm_fields['M']);
+       if (v == NULL) return;
+
+       /* Go through the vCard searching for *all* instances of
+        * the "email;internet" key
+        */
+       do {
+               s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
+               if (s != NULL) {
+                       addr = strdoop(s);
+                       striplt(addr);
+                       if (strlen(addr) > 0) {
+                               if (callback != NULL) {
+                                       callback(addr, citadel_address);
+                               }
+                       }
+                       phree(addr);
+                       found_something = 1;
+               }
+               else {
+                       found_something = 0;
+               }
+       } while(found_something);
+
+       vcard_free(v);
+}
+
+
+
+/*
+ * Callback for vcard_add_to_directory()
+ * (Lotsa ugly nested callbacks.  Oh well.)
+ * This little shim function makes sure we're not 
+ */
+void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
+       char buf[SIZ];
+
+       /* We have to validate that we're not stepping on someone else's
+        * email address ... but only if we're logged in.  Otherwise it's
+        * probably just the networker or something.
+        */
+       if (CC->logged_in) {
+               lprintf(9, "Checking for <%s>...\n", internet_addr);
+               if (CtdlDirectoryLookup(buf, internet_addr) == 0) {
+                       if (strcasecmp(buf, citadel_addr)) {
+                               /* This address belongs to someone else.
+                                * Bail out silently without saving.
+                                */
+                               lprintf(9, "DOOP!\n");
+                               return;
+                       }
+               }
+       }
+       lprintf(9, "ADDING!\n");
+       CtdlDirectoryAddUser(internet_addr, citadel_addr);
+}
+
+
+/*
+ * Back end function for cmd_igab()
+ */
+void vcard_add_to_directory(long msgnum, void *data) {
+       struct CtdlMessage *msg;
+
+       msg = CtdlFetchMessage(msgnum);
+       if (msg != NULL) {
+               vcard_extract_internet_addresses(msg, vcard_directory_add_user);
+       }
+
+       CtdlFreeMessage(msg);
+}
+
+
+/*
+ * Initialize Global Adress Book
+ */
+void cmd_igab(char *argbuf) {
+        char hold_rm[ROOMNAMELEN];
+
+       if (CtdlAccessCheck(ac_aide)) return;
+
+        strcpy(hold_rm, CC->room.QRname);      /* save current room */
+
+        if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
+                getroom(&CC->room, hold_rm);
+               cprintf("%d cannot get address book room\n", ERROR);
+               return;
+        }
+
+       /* Empty the existing database first.
+        */
+       CtdlDirectoryInit();
+
+        /* We want the last (and probably only) vcard in this room */
+        CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard",
+               NULL, vcard_add_to_directory, NULL);
+
+        getroom(&CC->room, hold_rm);   /* return to saved room */
+       cprintf("%d Directory has been rebuilt.\n", CIT_OK);
+}
+
+
+
+
+/*
+ * See if there is a valid Internet address in a vCard to use for outbound
+ * Internet messages.  If there is, stick it in CC->cs_inet_email.
+ */
+void vcard_populate_cs_inet_email(struct vCard *v) {
+       char *s, *addr;
+       int continue_searching = 1;
+       int instance = 0;
+
+       /* Go through the vCard searching for *all* instances of
+        * the "email;internet" key
+        */
+       do {
+               s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
+               if (s != NULL) {
+                       continue_searching = 1;
+                       addr = strdoop(s);
+                       striplt(addr);
+                       if (strlen(addr) > 0) {
+                               if (IsDirectory(addr)) {
+                                       continue_searching = 0;
+                                       safestrncpy(CC->cs_inet_email,
+                                               addr,
+                                               sizeof(CC->cs_inet_email)
+                                       );
+                               }
+                       }
+                       phree(addr);
+               }
+               else {
+                       continue_searching = 0;
+               }
+       } while(continue_searching);
+}
+
+
+
 /*
  * This handler detects whether the user is attempting to save a new
  * vCard as part of his/her personal configuration, and handles the replace
@@ -56,26 +253,28 @@ unsigned long SYM_VCARD;
 int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
-        char config_rm[ROOMNAMELEN];
-       char buf[256];
-
+       char buf[SIZ];
+       struct ctdluser usbuf;
+       long what_user;
 
        if (!CC->logged_in) return(0);  /* Only do this if logged in. */
-       TRACE;
 
-       /* If this isn't the configuration room, or if this isn't a MIME
-        * message, don't bother.  (Check for NULL room first, otherwise
-        * some messages will cause it to crash!!)
-        */
-       if (msg->cm_fields['O'] == NULL) return(0);
-       TRACE;
-       if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
-       TRACE;
+       /* If this isn't a "My Citadel Config" room, don't bother. */
+       if ( (CC->room.QRflags && QR_MAILBOX)
+          && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+               /* Yes, we want to do this */
+       }
+       else {
+               return(0);
+       }
+
+       /* If this isn't a MIME message, don't bother. */
        if (msg->cm_format_type != 4) return(0);
-       TRACE;
+
+       /* Ok, if we got this far, look into the situation further... */
 
        ptr = msg->cm_fields['M'];
-       TRACE;
+       if (ptr == NULL) return(0);
        while (ptr != NULL) {
        
                linelen = strcspn(ptr, "\n");
@@ -83,48 +282,56 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                
                if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
                        /* Bingo!  The user is uploading a new vCard, so
-                        * delete the old one.
+                        * delete the old one.  First, figure out which user
+                        * is being re-registered...
                         */
+                       what_user = atol(CC->room.QRname);
+
+                       if (what_user == CC->user.usernum) {
+                               /* It's the logged in user.  That was easy. */
+                               memcpy(&usbuf, &CC->user,
+                                       sizeof(struct ctdluser) );
+                       }
+                       
+                       else if (getuserbynumber(&usbuf, what_user) == 0) {
+                               /* We fetched a valid user record */
+                       }
+               
+                       else {
+                               /* No user with that number! */
+                               return(0);
+                       }
 
                        /* 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.
-                        * 
-                        * FIXME ... 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.
                         */
-                       TRACE;
-                       MailboxName(config_rm, &CC->usersupp, USERCONFIGROOM);
-                       TRACE;
-                       CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
-                       TRACE;
+                       CtdlDeleteMessages(CC->room.QRname,
+                                       0L, "text/x-vcard");
 
                        /* 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']);
-                       TRACE;
 
-                        sprintf(buf,
-                                "Citadel vCard: personal card for %s at %s",
+                        if (msg->cm_fields['A'] != NULL)
+                                phree(msg->cm_fields['A']);
+
+                       msg->cm_fields['A'] = strdoop(usbuf.fullname);
+
+                        snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
                                 msg->cm_fields['A'], NODENAME);
                         msg->cm_fields['E'] = strdoop(buf);
-                       TRACE;
 
                        /* Now allow the save to complete. */
-                       TRACE;
                        return(0);
                }
-               TRACE;
 
                ptr = strchr((char *)ptr, '\n');
-               TRACE;
                if (ptr != NULL) ++ptr;
        }
-       TRACE;
 
        return(0);
 }
@@ -141,17 +348,19 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
        long I;
-
+       struct vCard *v;
 
        if (!CC->logged_in) return(0);  /* Only do this if logged in. */
 
        /* If this isn't the configuration room, or if this isn't a MIME
         * message, don't bother.
         */
+       if (msg->cm_fields['O'] == NULL) return(0);
        if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
        if (msg->cm_format_type != 4) return(0);
 
        ptr = msg->cm_fields['M'];
+       if (ptr == NULL) return(0);
        while (ptr != NULL) {
        
                linelen = strcspn(ptr, "\n");
@@ -165,9 +374,28 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        I = atol(msg->cm_fields['I']);
                        if (I < 0L) return(0);
 
+                       /* Put it in the Global Address Book room... */
                        CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
                                (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
 
+                       /* ...and also in the directory database. */
+                       vcard_add_to_directory(I, NULL);
+
+                       /* Store our Internet return address in memory */
+                       v = vcard_load(msg->cm_fields['M']);
+                       vcard_populate_cs_inet_email(v);
+                       vcard_free(v);
+
+                       /* Some sites want an Aide to be notified when a
+                        * user registers or re-registers...
+                        */
+                       set_mm_valid();
+
+                       /* ...which also means we need to flag the user */
+                       lgetuser(&CC->user, CC->curr_user);
+                       CC->user.flags |= (US_REGIS|US_NEEDVALID);
+                       lputuser(&CC->user);
+
                        return(0);
                }
 
@@ -183,7 +411,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 /*
  * back end function used for callbacks
  */
-void vcard_gu_backend(long msgnum) {
+void vcard_gu_backend(long msgnum, void *userdata) {
        VC->msgnum = msgnum;
 }
 
@@ -192,25 +420,25 @@ void vcard_gu_backend(long msgnum) {
  * If this user has a vcard on disk, read it into memory, otherwise allocate
  * and return an empty vCard.
  */
-struct vCard *vcard_get_user(struct usersupp *u) {
+struct vCard *vcard_get_user(struct ctdluser *u) {
         char hold_rm[ROOMNAMELEN];
         char config_rm[ROOMNAMELEN];
        struct CtdlMessage *msg;
        struct vCard *v;
 
-        strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
-        MailboxName(config_rm, u, USERCONFIGROOM);
+        strcpy(hold_rm, CC->room.QRname);      /* save current room */
+        MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
-        if (getroom(&CC->quickroom, config_rm) != 0) {
-                getroom(&CC->quickroom, hold_rm);
+        if (getroom(&CC->room, config_rm) != 0) {
+                getroom(&CC->room, hold_rm);
                 return vcard_new();
         }
 
         /* We want the last (and probably only) vcard in this room */
        VC->msgnum = (-1);
-        CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard",
-               NULL, vcard_gu_backend);
-        getroom(&CC->quickroom, hold_rm);      /* return to saved room */
+        CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
+               NULL, vcard_gu_backend, NULL);
+        getroom(&CC->room, hold_rm);   /* return to saved room */
 
        if (VC->msgnum < 0L) return vcard_new();
 
@@ -229,7 +457,7 @@ struct vCard *vcard_get_user(struct usersupp *u) {
 /*
  * Write our config to disk
  */
-void vcard_write_user(struct usersupp *u, struct vCard *v) {
+void vcard_write_user(struct ctdluser *u, struct vCard *v) {
         char temp[PATH_MAX];
         FILE *fp;
        char *ser;
@@ -267,81 +495,75 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) {
 
 
 /*
- * old style "enter registration info" command
+ * Old style "enter registration info" command.  This function simply honors
+ * the REGI protocol command, translates the entered parameters into a vCard,
+ * and enters the vCard into the user's configuration.
  */
 void cmd_regi(char *argbuf) {
        int a,b,c;
-       char buf[256];
+       char buf[SIZ];
        struct vCard *my_vcard;
 
-       char tmpaddr[256];
-       char tmpcity[256];
-       char tmpstate[256];
-       char tmpzip[256];
-       char tmpaddress[512];
+       char tmpaddr[SIZ];
+       char tmpcity[SIZ];
+       char tmpstate[SIZ];
+       char tmpzip[SIZ];
+       char tmpaddress[SIZ];
+       char tmpcountry[SIZ];
 
        if (!(CC->logged_in)) {
                cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
                return;
-               }
+       }
 
-       my_vcard = vcard_get_user(&CC->usersupp);
+       my_vcard = vcard_get_user(&CC->user);
        strcpy(tmpaddr, "");
        strcpy(tmpcity, "");
        strcpy(tmpstate, "");
        strcpy(tmpzip, "");
+       strcpy(tmpcountry, "USA");
 
        cprintf("%d Send registration...\n", SEND_LISTING);
        a=0;
        while (client_gets(buf), strcmp(buf,"000")) {
-               if (a==0) vcard_set_prop(my_vcard, "n", buf);
-               if (a==1) strcpy(tmpaddr,buf);
-               if (a==2) strcpy(tmpcity,buf);
-               if (a==3) strcpy(tmpstate,buf);
+               if (a==0) vcard_set_prop(my_vcard, "n", buf, 0);
+               if (a==1) strcpy(tmpaddr, buf);
+               if (a==2) strcpy(tmpcity, buf);
+               if (a==3) strcpy(tmpstate, buf);
                if (a==4) {
                        for (c=0; c<strlen(buf); ++c) {
-                               if ((buf[c]>='0')&&(buf[c]<='9')) {
-                                       b=strlen(tmpzip);
-                                       tmpzip[b]=buf[c];
-                                       tmpzip[b+1]=0;
-                                       }
+                               if ((buf[c]>='0') && (buf[c]<='9')) {
+                                       b = strlen(tmpzip);
+                                       tmpzip[b] = buf[c];
+                                       tmpzip[b+1] = 0;
                                }
                        }
-               if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
-               if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
-               ++a;
                }
-       sprintf(tmpaddress, ";;%s;%s;%s;%s;USA",
-               tmpaddr, tmpcity, tmpstate, tmpzip);
-       vcard_set_prop(my_vcard, "adr", tmpaddress);
-       vcard_write_user(&CC->usersupp, my_vcard);
-       vcard_free(my_vcard);
-
-       lgetuser(&CC->usersupp, CC->curr_user);
-       CC->usersupp.flags=(CC->usersupp.flags|US_REGIS|US_NEEDVALID);
-       lputuser(&CC->usersupp);
-
-       /* set global flag calling for validation */
-       begin_critical_section(S_CONTROL);
-       get_control();
-       CitControl.MMflags = CitControl.MMflags | MM_VALID ;
-       put_control();
-       end_critical_section(S_CONTROL);
+               if (a==5) vcard_set_prop(my_vcard, "tel;home", buf, 0);
+               if (a==6) vcard_set_prop(my_vcard, "email;internet", buf, 0);
+               if (a==7) strcpy(tmpcountry, buf);
+               ++a;
        }
 
+       snprintf(tmpaddress, sizeof tmpaddress, ";;%s;%s;%s;%s;%s",
+               tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry);
+       vcard_set_prop(my_vcard, "adr", tmpaddress, 0);
+       vcard_write_user(&CC->user, my_vcard);
+       vcard_free(my_vcard);
+}
 
 
 /*
- * get registration info for a user
+ * Protocol command to fetch registration info for a user
  */
 void cmd_greg(char *argbuf)
 {
-       struct usersupp usbuf;
+       struct ctdluser usbuf;
        struct vCard *v;
        char *s;
-       char who[256];
-       char adr[256];
-       char buf[256];
+       char who[SIZ];
+       char adr[SIZ];
+       char buf[SIZ];
 
        extract(who, argbuf, 0);
 
@@ -352,7 +574,7 @@ void cmd_greg(char *argbuf)
 
        if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user);
 
-       if ((CC->usersupp.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
+       if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
                return;
@@ -368,11 +590,11 @@ void cmd_greg(char *argbuf)
        cprintf("%d %s\n", LISTING_FOLLOWS, usbuf.fullname);
        cprintf("%ld\n", usbuf.usernum);
        cprintf("%s\n", usbuf.password);
-       s = vcard_get_prop(v, "n", 0);
+       s = vcard_get_prop(v, "n", 0, 0, 0);
        cprintf("%s\n", s ? s : " ");   /* name */
 
-       s = vcard_get_prop(v, "adr", 0);
-       sprintf(adr, "%s", s ? s : " ");/* address... */
+       s = vcard_get_prop(v, "adr", 0, 0, 0);
+       snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */
 
        extract_token(buf, adr, 2, ';');
        cprintf("%s\n", buf);                           /* street */
@@ -383,21 +605,26 @@ void cmd_greg(char *argbuf)
        extract_token(buf, adr, 5, ';');
        cprintf("%s\n", buf);                           /* zip */
 
-       s = vcard_get_prop(v, "tel;home", 0);
-       if (s == NULL) s = vcard_get_prop(v, "tel", 1);
+       s = vcard_get_prop(v, "tel;home", 0, 0, 0);
+       if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0, 0);
        if (s != NULL) {
                cprintf("%s\n", s);
-               }
+       }
        else {
                cprintf(" \n");
        }
 
        cprintf("%d\n", usbuf.axlevel);
 
-       s = vcard_get_prop(v, "email;internet", 0);
+       s = vcard_get_prop(v, "email;internet", 0, 0, 0);
        cprintf("%s\n", s ? s : " ");
+       s = vcard_get_prop(v, "adr", 0, 0, 0);
+       snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */
+
+       extract_token(buf, adr, 6, ';');
+       cprintf("%s\n", buf);                           /* country */
        cprintf("000\n");
-       }
+}
 
 
 /*
@@ -407,7 +634,7 @@ void cmd_greg(char *argbuf)
  */
 void vcard_purge(char *username, long usernum) {
        struct CtdlMessage *msg;
-       char buf[256];
+       char buf[SIZ];
 
        msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
        if (msg == NULL) return;
@@ -421,23 +648,144 @@ void vcard_purge(char *username, long usernum) {
         msg->cm_fields['N'] = strdoop(NODENAME);
         msg->cm_fields['M'] = strdoop("Purge this vCard\n");
 
-        sprintf(buf,
-                "Citadel vCard: personal card for %s at %s",
-                msg->cm_fields['A'], NODENAME);
+        snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+                       msg->cm_fields['A'], NODENAME);
         msg->cm_fields['E'] = strdoop(buf);
 
        msg->cm_fields['S'] = strdoop("CANCEL");
 
-        CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL);
+        CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
         CtdlFreeMessage(msg);
-
-       /* Start a netproc run in the background, so the "purge" message
-        * gets flushed out of the room immediately
-        */
-       system("./netproc &");
 }
+
+
+/*
+ * Grab vCard directory stuff out of incoming network messages
+ */
+int vcard_extract_from_network(struct CtdlMessage *msg, char *target_room) {
+       char *ptr;
+       int linelen;
+
+       if (msg == NULL) return(0);
+
+       if (strcasecmp(target_room, ADDRESS_BOOK_ROOM)) {
+               return(0);
+       }
+
+       if (msg->cm_format_type != 4) return(0);
+
+       ptr = msg->cm_fields['M'];
+       if (ptr == NULL) return(0);
+       while (ptr != NULL) {
        
-       
+               linelen = strcspn(ptr, "\n");
+               if (linelen == 0) return(0);    /* end of headers */    
+               
+               if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
+                        /* It's a vCard.  Add it to the directory. */
+                       vcard_extract_internet_addresses(msg,
+                                                       CtdlDirectoryAddUser);
+                       return(0);
+               }
+
+               ptr = strchr((char *)ptr, '\n');
+               if (ptr != NULL) ++ptr;
+       }
+
+       return(0);
+}
+
+
+
+/* 
+ * When a vCard is being removed from the Global Address Book room, remove it
+ * from the directory as well.
+ */
+void vcard_delete_remove(char *room, long msgnum) {
+       struct CtdlMessage *msg;
+       char *ptr;
+       int linelen;
+
+       if (msgnum <= 0L) return;
+
+       if (strcasecmp(room, ADDRESS_BOOK_ROOM)) {
+               return;
+       }
+
+       msg = CtdlFetchMessage(msgnum);
+       if (msg == NULL) return;
+
+       ptr = msg->cm_fields['M'];
+       if (ptr == NULL) goto EOH;
+       while (ptr != NULL) {
+               linelen = strcspn(ptr, "\n");
+               if (linelen == 0) goto EOH;
+               
+               if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
+                       /* Bingo!  A vCard is being deleted.
+                       */
+                       vcard_extract_internet_addresses(msg,
+                                                       CtdlDirectoryDelUser);
+               }
+               ptr = strchr((char *)ptr, '\n');
+               if (ptr != NULL) ++ptr;
+       }
+
+EOH:   CtdlFreeMessage(msg);
+}
+
+
+
+/*
+ * Query Directory
+ */
+void cmd_qdir(char *argbuf) {
+       char citadel_addr[SIZ];
+       char internet_addr[SIZ];
+
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
+       extract(internet_addr, argbuf, 0);
+
+       if (CtdlDirectoryLookup(citadel_addr, internet_addr) != 0) {
+               cprintf("%d %s was not found.\n",
+                       ERROR+NO_SUCH_USER, internet_addr);
+               return;
+       }
+
+       cprintf("%d %s\n", CIT_OK, citadel_addr);
+}
+
+
+/*
+ * We don't know if the Contacts room exists so we just create it at login
+ */
+void vcard_create_room(void)
+{
+       struct ctdlroom qr;
+       struct visit vbuf;
+
+       /* Create the calendar room if it doesn't already exist */
+       create_room(USERCONTACTSROOM, 4, "", 0, 1, 0);
+
+       /* Set expiration policy to manual; otherwise objects will be lost! */
+       if (lgetroom(&qr, USERCONTACTSROOM)) {
+               lprintf(3, "Couldn't get the user CONTACTS room!\n");
+               return;
+       }
+       qr.QRep.expire_mode = EXPIRE_MANUAL;
+       qr.QRdefaultview = 2;   /* 2 = address book view */
+       lputroom(&qr);
+
+       /* Set the view to a calendar view */
+       CtdlGetRelationship(&vbuf, &CC->user, &qr);
+       vbuf.v_view = 2;        /* 2 = address book view */
+       CtdlSetRelationship(&vbuf, &CC->user, &qr);
+
+       return;
+}
+
+
 
 
 /*
@@ -448,18 +796,36 @@ void vcard_session_startup_hook(void) {
 }
 
 
-char *Dynamic_Module_Init(void)
+/*
+ * When a user logs in...
+ */
+void vcard_session_login_hook(void) {
+       struct vCard *v;
+
+       v = vcard_get_user(&CC->user);
+       vcard_populate_cs_inet_email(v);
+
+       vcard_free(v);
+
+       vcard_create_room();
+}
+
+
+
+char *serv_vcard_init(void)
 {
-       SYM_VCARD = CtdlGetDynamicSymbol();
        CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START);
+       CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
        CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
        CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
+       CtdlRegisterDeleteHook(vcard_delete_remove);
        CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
        CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
+       CtdlRegisterProtoHook(cmd_igab, "IGAB",
+                                       "Initialize Global Address Book");
+       CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
        CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
-       create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
+       CtdlRegisterNetprocHook(vcard_extract_from_network);
+       create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0);
        return "$Id$";
 }
-
-
-