X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=9505ba1852efd110e7dca1a496878bfa3ccaf0d4;hb=62ef1542cefd2c2ff068a8b65d86d2e2a41c5ad8;hp=2dcd127191c5fb787662538ef8b79fff8b90b8b5;hpb=545c8447253a4d6281d89674074623f04ce55b36;p=citadel.git diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 2dcd12719..9505ba185 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -2,21 +2,15 @@ * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2009 by the citadel.org team + * Copyright (c) 1999-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -147,30 +141,30 @@ int vcard_directory_add_user(char *internet_addr, char *citadel_addr) { * probably just the networker or something. */ if (CCC->logged_in) { - syslog(LOG_DEBUG, "Checking for <%s>...\n", internet_addr); + syslog(LOG_DEBUG, "Checking for <%s>...", internet_addr); if (CtdlDirectoryLookup(buf, internet_addr, sizeof buf) == 0) { if (strcasecmp(buf, citadel_addr)) { /* This address belongs to someone else. * Bail out silently without saving. */ - syslog(LOG_DEBUG, "DOOP!\n"); + syslog(LOG_DEBUG, "DOOP!"); 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, _("Unable to add this email address again."), -1, 0); StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n"), 0); return 0; } } } - syslog(LOG_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr); + syslog(LOG_INFO, "Adding %s (%s) to directory", citadel_addr, internet_addr); if (CtdlDirectoryAddUser(internet_addr, citadel_addr)) { 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); + StrBufAppendBufPlain(CCC->StatusMessage, _("Successfully added email address."), -1, 0); return 1; } else @@ -178,7 +172,7 @@ int vcard_directory_add_user(char *internet_addr, char *citadel_addr) { 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); + StrBufAppendBufPlain(CCC->StatusMessage, _("Unable to add this email address. It does not match any local domain."), -1, 0); return 0; } } @@ -319,7 +313,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, if ( (!strcasecmp(cbtype, "text/x-vcard")) || (!strcasecmp(cbtype, "text/vcard")) ) { - syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...\n", partnum); + syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...", partnum); if (*v != NULL) { vcard_free(*v); } @@ -353,7 +347,6 @@ 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 */ @@ -367,7 +360,6 @@ 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. */ @@ -398,8 +390,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { return(1); } - s = vcard_get_prop(v, "fn", 1, 0, 0); - if (s) syslog(LOG_DEBUG, "GAB: vCard beforesave hook running for <%s>\n", s); + vcard_get_prop(v, "fn", 1, 0, 0); if (yes_my_citadel_config) { /* Bingo! The user is uploading a new vCard, so @@ -430,7 +421,6 @@ 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. */ @@ -506,7 +496,6 @@ 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); } @@ -535,17 +524,14 @@ 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); @@ -569,8 +555,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * copy it to the Global Address Book room. */ - I = atol(msg->cm_fields['I']); - if (I < 0L) return(0); + I = atol(msg->cm_fields['3']); + if (I <= 0L) return(0); /* Store our Internet return address in memory */ if (is_MY_UserConf) { @@ -585,7 +571,6 @@ 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); } @@ -858,7 +843,7 @@ void vcard_newuser(struct ctdluser *usbuf) { struct vCard *v; vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); - syslog(LOG_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); + syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname); /* Create and save the vCard */ v = vcard_new(); @@ -877,7 +862,7 @@ void vcard_newuser(struct ctdluser *usbuf) { if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) { #else // SOLARIS_GETPWUID struct passwd *result = NULL; - syslog(LOG_DEBUG, "Searching for uid %d\n", usbuf->uid); + syslog(LOG_DEBUG, "Searching for uid %d", usbuf->uid); if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) { #endif // HAVE_GETPWUID_R snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn); @@ -1062,9 +1047,9 @@ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp, char *cbid, void *cbuserdata) { struct vCard *v; - char displayname[256]; + char displayname[256] = ""; int displayname_len; - char emailaddr[256]; + char emailaddr[256] = ""; int i; int has_commas = 0; @@ -1164,13 +1149,13 @@ void check_get(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_CRIT, "vcard client disconnected: ending session.\n"); + syslog(LOG_CRIT, "vcard client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - syslog(LOG_INFO, ": %s\n", cmdbuf); + syslog(LOG_INFO, ": %s", cmdbuf); while (strlen(cmdbuf) < 3) strcat(cmdbuf, " "); - syslog(LOG_INFO, "[ %s]\n", cmdbuf); + syslog(LOG_INFO, "[ %s]", cmdbuf); if (strncasecmp(cmdbuf, "GET ", 4)==0) { @@ -1187,22 +1172,20 @@ void check_get(void) { { cprintf("200 OK %s\n", internet_addr); - syslog(LOG_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp); + syslog(LOG_INFO, "sending 200 OK for the room %s", rcpt->display_recp); } else { cprintf("500 REJECT noone here by that name.\n"); - syslog(LOG_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr); + syslog(LOG_INFO, "sending 500 REJECT no one here by that name: %s", internet_addr); } if (rcpt != NULL) free_recipients(rcpt); } - else - { + else { cprintf("500 REJECT invalid Query.\n"); - - syslog(LOG_INFO, "sending 500 REJECT invalid Query: %s\n", internet_addr); + syslog(LOG_INFO, "sending 500 REJECT invalid query: %s", internet_addr); } } @@ -1224,7 +1207,7 @@ void vcard_CtdlCreateRoom(void) /* Set expiration policy to manual; otherwise objects will be lost! */ if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) { - syslog(LOG_ERR, "Couldn't get the user CONTACTS room!\n"); + syslog(LOG_ERR, "Couldn't get the user CONTACTS room!"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; @@ -1398,7 +1381,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { } vcard_free(v); - syslog(LOG_DEBUG, "Adding contact: %s\n", recipient); + syslog(LOG_DEBUG, "Adding contact: %s", recipient); CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); CtdlFreeMessage(vmsg); } @@ -1507,7 +1490,7 @@ CTDL_MODULE_INIT(vcard) if (fp != NULL) fclose(fp); rv = chown(filename, CTDLUID, (-1)); if (rv == -1) - syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", + syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]", filename, strerror(errno)); }