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

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 2a33e84a050b1db7d5402dc89c69e35e08bf93d6..b43cbfb300014c784aa9c70590aad2d53be974e3 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -1,11 +1,9 @@
 /*
- * serv_vcard.c
+ * $Id$
  * 
  * A server-side module for Citadel which supports address book information
  * using the standard vCard format.
  *
- * $Id$
- *
  */
 
 #define ADDRESS_BOOK_ROOM      "Global Address Book"
@@ -62,10 +60,12 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char buf[256];
 
 
+       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 (strcasecmp(msg->cm_fields['O'], CONFIGROOM)) return(0);
+       if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
        if (msg->cm_format_type != 4) return(0);
 
        ptr = msg->cm_fields['M'];
@@ -84,11 +84,11 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                         * 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
+                        * 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.
                         */
-                       MailboxName(config_rm, &CC->usersupp, CONFIGROOM);
+                       MailboxName(config_rm, &CC->usersupp, USERCONFIGROOM);
                        CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
 
                        /* Set the Extended-ID to a standardized one so the
@@ -127,10 +127,12 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
        long I;
 
 
+       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 (strcasecmp(msg->cm_fields['O'], CONFIGROOM)) return(0);
+       if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
        if (msg->cm_format_type != 4) return(0);
 
        ptr = msg->cm_fields['M'];
@@ -181,7 +183,7 @@ struct vCard *vcard_get_user(struct usersupp *u) {
        struct vCard *v;
 
         strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
-        MailboxName(config_rm, u, CONFIGROOM);
+        MailboxName(config_rm, u, USERCONFIGROOM);
 
         if (getroom(&CC->quickroom, config_rm) != 0) {
                 getroom(&CC->quickroom, hold_rm);
@@ -190,7 +192,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",
+        CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard",
                NULL, vcard_gu_backend);
         getroom(&CC->quickroom, hold_rm);      /* return to saved room */
 
@@ -235,7 +237,7 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) {
         * have to, because the vcard_upload_beforesave() hook above
         * is going to notice what we're trying to do, and delete the old vCard.
         */
-        CtdlWriteObject(CONFIGROOM,    /* which room */
+        CtdlWriteObject(USERCONFIGROOM,        /* which room */
                        "text/x-vcard", /* MIME type */
                        temp,           /* temp file */
                        u,              /* which user */
@@ -320,7 +322,7 @@ void cmd_greg(char *argbuf)
 {
        struct usersupp usbuf;
        struct vCard *v;
-       char *tel;
+       char *s;
        char who[256];
        char adr[256];
        char buf[256];
@@ -350,9 +352,11 @@ void cmd_greg(char *argbuf)
        cprintf("%d %s\n", LISTING_FOLLOWS, usbuf.fullname);
        cprintf("%ld\n", usbuf.usernum);
        cprintf("%s\n", usbuf.password);
-       cprintf("%s\n", vcard_get_prop(v, "n", 0));     /* name */
+       s = vcard_get_prop(v, "n", 0);
+       cprintf("%s\n", s ? s : " ");   /* name */
 
-       sprintf(adr, "%s", vcard_get_prop(v, "adr", 0));/* address... */
+       s = vcard_get_prop(v, "adr", 0);
+       sprintf(adr, "%s", s ? s : " ");/* address... */
 
        extract_token(buf, adr, 2, ';');
        cprintf("%s\n", buf);                           /* street */
@@ -363,10 +367,10 @@ void cmd_greg(char *argbuf)
        extract_token(buf, adr, 5, ';');
        cprintf("%s\n", buf);                           /* zip */
 
-       tel = vcard_get_prop(v, "tel;home", 0);
-       if (tel == NULL) tel = vcard_get_prop(v, "tel", 1);
-       if (tel != NULL) {
-               cprintf("%s\n", tel);
+       s = vcard_get_prop(v, "tel;home", 0);
+       if (s == NULL) s = vcard_get_prop(v, "tel", 1);
+       if (s != NULL) {
+               cprintf("%s\n", s);
                }
        else {
                cprintf(" \n");
@@ -374,7 +378,8 @@ void cmd_greg(char *argbuf)
 
        cprintf("%d\n", usbuf.axlevel);
 
-       cprintf("%s\n", vcard_get_prop(v, "email;internet", 0));
+       s = vcard_get_prop(v, "email;internet", 0);
+       cprintf("%s\n", s ? s : " ");
        cprintf("000\n");
        }
 
@@ -407,7 +412,7 @@ void vcard_purge(char *username, long usernum) {
 
        msg->cm_fields['S'] = strdoop("CANCEL");
 
-        CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL, 1);
+        CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL);
         CtdlFreeMessage(msg);
 
        /* Start a netproc run in the background, so the "purge" message
@@ -436,7 +441,7 @@ char *Dynamic_Module_Init(void)
        CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
        CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
        CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
-       create_room(ADDRESS_BOOK_ROOM, 0, "", 0);
+       create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
        return "$Id$";
 }