Citadel API clean up.

[citadel.git] / citadel / modules / newuser / serv_newuser.c

diff --git a/citadel/modules/newuser/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c
index ac47feb102d71a7971e6f9184dd6d54b7844eb2b..dae9c40cfa89925cbe92bad3d0989a990f6c0b98 100644 (file)
--- a/citadel/modules/newuser/serv_newuser.c
+++ b/citadel/modules/newuser/serv_newuser.c
@@ -4,6 +4,21 @@
  * Automaticalyl copies the contents of a "New User Greetings" room to the
  * inbox of any new user upon account creation.
  *
+ * Copyright (c) 1987-2009 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 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
  */
 
 /*
@@ -41,7 +56,6 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
 #include "database.h"
@@ -74,7 +88,7 @@ void CopyNewUserGreetings(void) {
        /* Go to the source room ... bail out silently if it's not there,
         * or if it's not private.
         */
-       if (getroom(&CC->room, NEWUSERGREETINGS) != 0) return;
+       if (CtdlGetRoom(&CC->room, NEWUSERGREETINGS) != 0) return;
        if (! CC->room.QRflags & QR_PRIVATE ) return;
 
        cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
@@ -87,7 +101,7 @@ void CopyNewUserGreetings(void) {
        }
 
        if (num_msgs > 0) {
-               CtdlCopyMsgsToRoom(msglist, num_msgs, mailboxname);
+               CtdlSaveMsgPointersInRoom(mailboxname, msglist, num_msgs, 1, NULL);
        }
 
        /* Now free the memory we used, and go away. */
@@ -97,8 +111,11 @@ void CopyNewUserGreetings(void) {
 
 CTDL_MODULE_INIT(newuser)
 {
-   CtdlRegisterSessionHook(CopyNewUserGreetings, EVT_LOGIN);
-
-   /* return our Subversion id for the Log */
-   return "$Id$";
+       if (!threading)
+       {
+               CtdlRegisterSessionHook(CopyNewUserGreetings, EVT_LOGIN);
+       }
+       
+       /* return our Subversion id for the Log */
+       return "$Id$";
 }