From 202cedc75a57d8edfe032d16ff67a9ca8403dc4f Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 5 Dec 2011 22:38:15 +0100 Subject: [PATCH] output a list with status numbers & terminate them with 000 as we do elsewhere. --- citadel/modules/vcard/serv_vcard.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index a467c9f22..c578eb430 100644 --- 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); @@ -547,6 +548,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"); -- 2.30.2