X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnewuser%2Fserv_newuser.c;h=0e4b8bad9605dd77e37581efaeec94ed33d54905;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=ac47feb102d71a7971e6f9184dd6d54b7844eb2b;hpb=84aa84fdd0a02f703c5e836f258e33f950c66355;p=citadel.git

diff --git a/citadel/modules/newuser/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c
index ac47feb10..0e4b8bad9 100644
--- 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
  */
 
 /*
@@ -87,7 +102,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 +112,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$";
 }