* give the flag to the CtdlDoIHavePermissionToPostInThisRoom in through the parameter...

[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 9bff42a41732740467b1cc9dfc3e4e5be3714252..fc610c79cd20404d96cc28e1e7f6fcc37e72b969 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -47,6 +47,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -59,9 +60,6 @@
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
-#include "tools.h"
-#include "mime_parser.h"
-#include "vcard.h"
 #include "serv_vcard.h"
 
 #include "ctdl_module.h"
@@ -252,6 +250,12 @@ void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
                if (!strcasecmp(v->prop[i].name, "tel;home"))
                        (void) CtdlDoDirectoryServiceFunc("homePhone", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
                else
+               if (!strcasecmp(v->prop[i].name, "tel;fax"))
+                       (void) CtdlDoDirectoryServiceFunc("facsimileTelephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+               else
+               if (!strcasecmp(v->prop[i].name, "tel;cell"))
+                       (void) CtdlDoDirectoryServiceFunc("mobile", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+               else
                if ( (!strcasecmp(v->prop[i].name, "tel"))
                   ||(!strncasecmp(v->prop[i].name, "tel;", 4)) ) {
                        (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
@@ -1267,7 +1271,7 @@ void check_get(void) {
                char *argbuf = &cmdbuf[4];
                
                extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
-               rcpt = validate_recipients(internet_addr);
+               rcpt = validate_recipients(internet_addr, CHECK_EXISTANCE);
                if ((rcpt != NULL)&&
                        (
                         (*rcpt->recp_local != '\0')||
@@ -1523,53 +1527,56 @@ CTDL_MODULE_INIT(vcard)
        char filename[256];
        FILE *fp;
 
-       CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
-       CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
-       CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
-       CtdlRegisterDeleteHook(vcard_delete_remove);
-       CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
-       CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
-       CtdlRegisterProtoHook(cmd_igab, "IGAB",
-                                       "Initialize Global Address Book");
-       CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
-       CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names");
-       CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses");
-       CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses");
-       CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
-       CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
-       CtdlRegisterNetprocHook(vcard_extract_from_network);
-       CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER);
-       CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
-       CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
-
-       /* Create the Global ADdress Book room if necessary */
-       create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+       if (!threading)
+       {
+               CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
+               CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
+               CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
+               CtdlRegisterDeleteHook(vcard_delete_remove);
+               CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
+               CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
+               CtdlRegisterProtoHook(cmd_igab, "IGAB",
+                                               "Initialize Global Address Book");
+               CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
+               CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names");
+               CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses");
+               CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses");
+               CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
+               CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
+               CtdlRegisterNetprocHook(vcard_extract_from_network);
+               CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER);
+               CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
+               CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
+
+               /* Create the Global ADdress Book room if necessary */
+               create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+
+               /* Set expiration policy to manual; otherwise objects will be lost! */
+               if (!lgetroom(&qr, ADDRESS_BOOK_ROOM)) {
+                       qr.QRep.expire_mode = EXPIRE_MANUAL;
+                       qr.QRdefaultview = VIEW_ADDRESSBOOK;    /* 2 = address book view */
+                       lputroom(&qr);
 
-       /* Set expiration policy to manual; otherwise objects will be lost! */
-       if (!lgetroom(&qr, ADDRESS_BOOK_ROOM)) {
-               qr.QRep.expire_mode = EXPIRE_MANUAL;
-               qr.QRdefaultview = VIEW_ADDRESSBOOK;    /* 2 = address book view */
-               lputroom(&qr);
-
-               /*
-                * Also make sure it has a netconfig file, so the networker runs
-                * on this room even if we don't share it with any other nodes.
-                * This allows the CANCEL messages (i.e. "Purge this vCard") to be
-                * purged.
-                */
-               assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir);
-               fp = fopen(filename, "a");
-               if (fp != NULL) fclose(fp);
-               chown(filename, CTDLUID, (-1));
-       }
+                       /*
+                        * Also make sure it has a netconfig file, so the networker runs
+                        * on this room even if we don't share it with any other nodes.
+                        * This allows the CANCEL messages (i.e. "Purge this vCard") to be
+                        * purged.
+                        */
+                       assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir);
+                       fp = fopen(filename, "a");
+                       if (fp != NULL) fclose(fp);
+                       chown(filename, CTDLUID, (-1));
+               }
 
-       /* for postfix tcpdict */
-       CtdlRegisterServiceHook(config.c_pftcpdict_port,        /* Postfix */
-                               NULL,
-                               check_get_greeting,
-                               check_get,
-                               NULL,
-                               CitadelServiceDICT_TCP);
+               /* for postfix tcpdict */
+               CtdlRegisterServiceHook(config.c_pftcpdict_port,        /* Postfix */
+                                       NULL,
+                                       check_get_greeting,
+                                       check_get,
+                                       NULL,
+                                       CitadelServiceDICT_TCP);
+       }
        
        /* return our Subversion id for the Log */
        return "$Id$";