More logging for Global Address Book saves, for debugging

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index a467c9f22bec961d53d169125224eb31494c6aff..2dcd127191c5fb787662538ef8b79fff8b90b8b5 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -154,10 +154,12 @@ int vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
                                 * Bail out silently without saving.
                                 */
                                syslog(LOG_DEBUG, "DOOP!\n");
-                               StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress again."), -1, 0);
-                               StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+                               
+                               StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ALREADY_EXISTS);
                                StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
                                StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+                               StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress again."), -1, 0);
+                               StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n"), 0);
                                return 0;
                        }
                }
@@ -165,18 +167,18 @@ int vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
        syslog(LOG_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr);
        if (CtdlDirectoryAddUser(internet_addr, citadel_addr))
        {
-               StrBufAppendBufPlain(CCC->StatusMessage, _("successfully addded emailaddress."), -1, 0);
-               StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+               StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", CIT_OK);
                StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
                StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+               StrBufAppendBufPlain(CCC->StatusMessage, _("successfully addded emailaddress."), -1, 0);
                return 1;
        }
        else
        {
-               StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0);
-               StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+               StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE);
                StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
                StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+               StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0);
                return 0;
        }
 }
@@ -272,11 +274,10 @@ void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len,
                                }
                                if (!IsDirectoryAddress && local_addrs_only)
                                {
-                                       StrBufAppendBufPlain(CCC->StatusMessage, 
-                                                            _("unable to add this emailaddress; its not matching our domain."), -1, 0);
-                                       StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+                                       StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE);
                                        StrBufAppendBufPlain(CCC->StatusMessage, addr, -1, 0);
                                        StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+                                       StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0);
                                }
                        }
                        free(addr);
@@ -352,6 +353,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
           && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                /* Yes, we want to do this */
                yes_my_citadel_config = 1;
+               syslog(LOG_DEBUG, "GAB: user config room detected");
 
 #ifdef VCARD_SAVES_BY_AIDES_ONLY
                /* Prevent non-aides from performing registration changes */
@@ -365,6 +367,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        /* Is this a room with an address book in it? */
        if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
                yes_any_vcard_room = 1;
+               syslog(LOG_DEBUG, "GAB: address book room detected");
        }
 
        /* If neither condition exists, don't run this hook. */
@@ -396,7 +399,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        }
 
        s = vcard_get_prop(v, "fn", 1, 0, 0);
-       if (s) syslog(LOG_DEBUG, "vCard beforesave hook running for <%s>\n", s);
+       if (s) syslog(LOG_DEBUG, "GAB: vCard beforesave hook running for <%s>\n", s);
 
        if (yes_my_citadel_config) {
                /* Bingo!  The user is uploading a new vCard, so
@@ -427,6 +430,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                 * vCard in the user's config room at all times.
                 *
                 */
+               syslog(LOG_DEBUG, "GAB: deleting old vCard for user");
                CtdlDeleteMessages(CC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
 
                /* Make the author of the message the name of the user. */
@@ -502,6 +506,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 
        /* Now allow the save to complete. */
        vcard_free(v);
+       syslog(LOG_DEBUG, "GAB: save will proceed");
        return(0);
 }
 
@@ -530,14 +535,17 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
        if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                is_UserConf = 1;        /* It's someone's config room */
+               syslog(LOG_DEBUG, "GAB: this is someone's config room");
        }
        CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
        if (!strcasecmp(CC->room.QRname, roomname)) {
                is_UserConf = 1;
                is_MY_UserConf = 1;     /* It's MY config room */
+               syslog(LOG_DEBUG, "GAB: this is MY config room");
        }
        if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) {
                is_GAB = 1;             /* It's the Global Address Book */
+               syslog(LOG_DEBUG, "GAB: this is the Global Address Book");
        }
 
        if (!is_UserConf && !is_GAB) return(0);
@@ -547,6 +555,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
        NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0);
 
+       StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS);
+
        while (ptr != NULL) {
        
                linelen = strcspn(ptr, "\n");
@@ -575,6 +585,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        if (!is_GAB)
                        {       // This is not the GAB
                                /* Put it in the Global Address Book room... */
+                               syslog(LOG_DEBUG, "GAB: copying to Global Address Book");
                                CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
                        }