/*
- * 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 <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#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"
#include "support.h"
#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
-/*
- * back end function used for callbacks
- */
-void vcard_gm_backend(long msgnum) {
- VC->msgnum = msgnum;
-}
-
-
/*
* This handler detects whether the user is attempting to save a new
* vCard as part of his/her personal configuration, and handles the replace
int vcard_upload_beforesave(struct CtdlMessage *msg) {
char *ptr;
int linelen;
- char hold_rm[ROOMNAMELEN];
char config_rm[ROOMNAMELEN];
- char buf[256];
+ char buf[SIZ];
+ if (!CC->logged_in) return(0); /* Only do this if logged in. */
+ TRACE;
+
/* If this isn't the configuration room, or if this isn't a MIME
- * message, don't bother.
+ * message, don't bother. (Check for NULL room first, otherwise
+ * some messages will cause it to crash!!)
*/
- if (strcasecmp(msg->cm_fields['O'], CONFIGROOM)) return(0);
+ if (msg->cm_fields['O'] == NULL) return(0);
+ TRACE;
+ if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
+ TRACE;
if (msg->cm_format_type != 4) return(0);
+ TRACE;
ptr = msg->cm_fields['M'];
+ if (ptr == NULL) return(0);
+ TRACE;
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
* delete the old one.
*/
- strcpy(hold_rm, CC->quickroom.QRname); /* save rm */
- MailboxName(config_rm, &CC->usersupp, CONFIGROOM);
-
- if (getroom(&CC->quickroom, config_rm) != 0) {
- getroom(&CC->quickroom, hold_rm);
- return(1); /* abort */
- }
- VC->msgnum = (-1L);
- CtdlForEachMessage(MSGS_ALL, 0,
- "text/x-vcard", NULL, vcard_gm_backend);
-
- if (VC->msgnum >= 0) {
- if (msg->cm_fields['Z'] != NULL)
- phree(msg->cm_fields['Z']);
- sprintf(buf, "%ld@%s", VC->msgnum, NODENAME);
- msg->cm_fields['Z'] = strdoop(buf);
- }
-
+ /* Delete the user's old vCard. This would probably
+ * get taken care of by the replication check, but we
+ * want to make sure there is absolutely only one
+ * vCard in the user's config room at all times.
+ *
+ * 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.
+ */
+ TRACE;
+ MailboxName(config_rm, &CC->usersupp, USERCONFIGROOM);
+ TRACE;
CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
+ TRACE;
- getroom(&CC->quickroom, hold_rm); /* return rm */
+ /* Set the Extended-ID to a standardized one so the
+ * replication always works correctly
+ */
+ if (msg->cm_fields['E'] != NULL)
+ phree(msg->cm_fields['E']);
+ TRACE;
+
+ sprintf(buf,
+ "Citadel vCard: personal card for %s at %s",
+ msg->cm_fields['A'], NODENAME);
+ msg->cm_fields['E'] = strdoop(buf);
+ TRACE;
+
+ /* Now allow the save to complete. */
+ TRACE;
return(0);
}
+ TRACE;
ptr = strchr((char *)ptr, '\n');
+ TRACE;
if (ptr != NULL) ++ptr;
}
+ TRACE;
return(0);
}
int vcard_upload_aftersave(struct CtdlMessage *msg) {
char *ptr;
int linelen;
- long Z, I;
- struct quickroom qrbuf;
- char buf[256];
+ 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 (msg->cm_fields['O'] == NULL) return(0);
+ if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
if (msg->cm_format_type != 4) return(0);
ptr = msg->cm_fields['M'];
+ if (ptr == NULL) return(0);
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
* copy it to the Global Address Book room.
*/
+ TRACE;
I = atol(msg->cm_fields['I']);
+ TRACE;
if (I < 0L) return(0);
- Z = (-1L);
- if (msg->cm_fields['Z'] != NULL) {
- extract_token(buf, msg->cm_fields['Z'], 1, '@');
- if (!strcasecmp(buf, NODENAME)) {
- extract_token(buf, msg->cm_fields['Z'],
- 0, '@');
- Z = atol(buf);
- }
- }
-
- if (getroom(&qrbuf, ADDRESS_BOOK_ROOM) != 0) return(0);
- AddMessageToRoom(&qrbuf, I);
- AdjRefCount(I, +1);
-
- if (Z > 0L) {
- CtdlDeleteMessages(ADDRESS_BOOK_ROOM, Z, NULL);
- }
+ CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
+ (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
return(0);
}
+/*
+ * back end function used for callbacks
+ */
+void vcard_gu_backend(long msgnum, void *userdata) {
+ VC->msgnum = msgnum;
+}
+
+
/*
* If this user has a vcard on disk, read it into memory, otherwise allocate
* and return an empty vCard.
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",
- NULL, vcard_gm_backend);
+ CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard",
+ NULL, vcard_gu_backend, NULL);
getroom(&CC->quickroom, hold_rm); /* return to saved room */
if (VC->msgnum < 0L) return vcard_new();
* 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 */
*/
void cmd_regi(char *argbuf) {
int a,b,c;
- char buf[256];
+ char buf[SIZ];
struct vCard *my_vcard;
- char tmpaddr[256];
- char tmpcity[256];
- char tmpstate[256];
- char tmpzip[256];
- char tmpphone[256];
- char tmpaddress[512];
+ char tmpaddr[SIZ];
+ char tmpcity[SIZ];
+ char tmpstate[SIZ];
+ char tmpzip[SIZ];
+ char tmpaddress[SIZ];
+ char tmpcountry[SIZ];
if (!(CC->logged_in)) {
cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
strcpy(tmpcity, "");
strcpy(tmpstate, "");
strcpy(tmpzip, "");
+ strcpy(tmpcountry, "USA");
cprintf("%d Send registration...\n", SEND_LISTING);
a=0;
}
}
}
- if (a==5) {
- strcpy(tmpphone, "");
- for (c=0; c<strlen(buf); ++c) {
- if ((buf[c]>='0')&&(buf[c]<='9')) {
- b=strlen(tmpphone);
- tmpphone[b]=buf[c];
- tmpphone[b+1]=0;
- }
- }
- vcard_set_prop(my_vcard, "tel;home", tmpphone);
- }
+ if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
+ if (a==7) strcpy(tmpcountry, buf);
++a;
}
- sprintf(tmpaddress, ";;%s;%s;%s;%s;USA",
- tmpaddr, tmpcity, tmpstate, tmpzip);
+ sprintf(tmpaddress, ";;%s;%s;%s;%s;%s",
+ tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry);
vcard_set_prop(my_vcard, "adr", tmpaddress);
vcard_write_user(&CC->usersupp, my_vcard);
vcard_free(my_vcard);
{
struct usersupp usbuf;
struct vCard *v;
- char *tel;
- char who[256];
- char adr[256];
- char buf[256];
+ char *s;
+ char who[SIZ];
+ char adr[SIZ];
+ char buf[SIZ];
extract(who, argbuf, 0);
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 : " ");
+ s = vcard_get_prop(v, "adr", 0);
+ sprintf(adr, "%s", s ? s : " ");/* address... */
+
+ extract_token(buf, adr, 6, ';');
+ cprintf("%s\n", buf); /* country */
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[SIZ];
+
+ 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, 1);
return "$Id$";
}
+
+
+
projects / citadel.git / blobdiff