X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnewuser%2Fserv_newuser.c;h=431d433df6ad006f41b9bb996372103695b6ec36;hb=182f984f6f03067f40a7e01bfa82df95f5605358;hp=08cf48d7e5fd47ae3d049d001070b08a933bd85d;hpb=fc86ffaec2bf78ee472ed8fffc4f0a0fa9599105;p=citadel.git

diff --git a/citadel/modules/newuser/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c
index 08cf48d7e..431d433df 100644
--- a/citadel/modules/newuser/serv_newuser.c
+++ b/citadel/modules/newuser/serv_newuser.c
@@ -1,24 +1,24 @@
 /*
  * $Id$
  *
- * Automaticalyl copies the contents of a "New User Greetings" room to the
+ * Automatically 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
+ * Copyright (c) 1987-2010 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 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.
+ * 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
+ * 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
  */
 
 /*
@@ -51,6 +51,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+
+#include "ctdl_module.h"
+
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -62,11 +65,8 @@
 #include "msgbase.h"
 
 
-#include "ctdl_module.h"
-
 
 
-extern struct CitContext *ContextList;
 
 
 /*
@@ -89,7 +89,7 @@ void CopyNewUserGreetings(void) {
 	 * or if it's not private.
 	 */
 	if (CtdlGetRoom(&CC->room, NEWUSERGREETINGS) != 0) return;
-	if (! CC->room.QRflags & QR_PRIVATE ) return;
+	if ((CC->room.QRflags & QR_PRIVATE) == 0) return;
 
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 
@@ -101,7 +101,7 @@ void CopyNewUserGreetings(void) {
 	}
 
 	if (num_msgs > 0) {
-		CtdlSaveMsgPointersInRoom(mailboxname, msglist, num_msgs, 1, NULL);
+		CtdlSaveMsgPointersInRoom(mailboxname, msglist, num_msgs, 1, NULL, 0);
 	}
 
 	/* Now free the memory we used, and go away. */