mk_module_init.sh now tests to see if echo supports -e and -E

[citadel.git] / citadel / serv_newuser.c

diff --git a/citadel/serv_newuser.c b/citadel/serv_newuser.c
index b0bb189ce042ff94c20f1e16784cc53f10e67891..ac47feb102d71a7971e6f9184dd6d54b7844eb2b 100644 (file)
--- a/citadel/serv_newuser.c
+++ b/citadel/serv_newuser.c
@@ -1,7 +1,8 @@
 /*
  * $Id$
  *
- * A skeleton module to test the dynamic loader.
+ * Automaticalyl copies the contents of a "New User Greetings" room to the
+ * inbox of any new user upon account creation.
  *
  */
 
@@ -37,17 +38,20 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 
+
+#include "ctdl_module.h"
+
+
+
 extern struct CitContext *ContextList;
 
 
@@ -58,44 +62,43 @@ void CopyNewUserGreetings(void) {
        struct cdbdata *cdbfr;
        long *msglist = NULL;
        int num_msgs = 0;
-       int i;
        char mailboxname[ROOMNAMELEN];
 
 
        /* Only do this for new users. */
-       if (CC->usersupp.timescalled != 1) return;
+       if (CC->user.timescalled != 1) return;
 
        /* This user's mailbox. */
-       MailboxName(mailboxname, sizeof mailboxname, &CC->usersupp, MAILROOM);
+       MailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM);
 
        /* Go to the source room ... bail out silently if it's not there,
         * or if it's not private.
         */
-       if (getroom(&CC->quickroom, NEWUSERGREETINGS) != 0) return;
-       if (! CC->quickroom.QRflags & QR_PRIVATE ) return;
+       if (getroom(&CC->room, NEWUSERGREETINGS) != 0) return;
+       if (! CC->room.QRflags & QR_PRIVATE ) return;
 
-       cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+       cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 
        if (cdbfr != NULL) {
-               msglist = mallok(cdbfr->len);
+               msglist = malloc(cdbfr->len);
                memcpy(msglist, cdbfr->ptr, cdbfr->len);
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
        }
 
        if (num_msgs > 0) {
-               for (i = 0; i < num_msgs; ++i) {
-                       CtdlCopyMsgToRoom(msglist[i], mailboxname);
-               }
+               CtdlCopyMsgsToRoom(msglist, num_msgs, mailboxname);
        }
 
        /* Now free the memory we used, and go away. */
-       if (msglist != NULL) phree(msglist);
+       if (msglist != NULL) free(msglist);
 }
 
 
-char *serv_newuser_init(void)
+CTDL_MODULE_INIT(newuser)
 {
    CtdlRegisterSessionHook(CopyNewUserGreetings, EVT_LOGIN);
+
+   /* return our Subversion id for the Log */
    return "$Id$";
 }