/*
- * 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"
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#include "citadel.h"
#include "server.h"
-#include <syslog.h>
#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
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'];
* 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
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'];
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);
/* 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 */
* 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 */
{
struct usersupp usbuf;
struct vCard *v;
- char *tel;
+ char *s;
char who[256];
char adr[256];
char buf[256];
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 */
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");
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");
}
+/*
+ * When a user is being deleted, we have to remove his/her vCard.
+ * This is accomplished by issuing a message with 'CANCEL' in the S (special)
+ * field, and the same Extended ID as the existing card.
+ */
+void vcard_purge(char *username, long usernum) {
+ struct CtdlMessage *msg;
+ char buf[256];
+
+ msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+ if (msg == NULL) return;
+ memset(msg, 0, sizeof(struct CtdlMessage));
+
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = MES_NORMAL;
+ msg->cm_format_type = 0;
+ msg->cm_fields['A'] = strdoop(username);
+ msg->cm_fields['O'] = strdoop(ADDRESS_BOOK_ROOM);
+ 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);
+ msg->cm_fields['E'] = strdoop(buf);
+
+ msg->cm_fields['S'] = strdoop("CANCEL");
+ CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL);
+ CtdlFreeMessage(msg);
+
+ /* Start a netproc run in the background, so the "purge" message
+ * gets flushed out of the room immediately
+ */
+ system("./netproc &");
+}
+
+
+
+
+/*
+ * Session startup, allocate some per-session data
+ */
void vcard_session_startup_hook(void) {
CtdlAllocUserData(SYM_VCARD, sizeof(struct vcard_internal_info));
}
-
char *Dynamic_Module_Init(void)
{
SYM_VCARD = CtdlGetDynamicSymbol();
CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
- create_room(ADDRESS_BOOK_ROOM, 0, "", 0);
+ CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
+ create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
return "$Id$";
}
+
+
+