More changes of 'free software' to 'open source' made for the express purpose of...

[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 dae9c40cfa89925cbe92bad3d0989a990f6c0b98..2be9b1a5a46bded6802c689fa0cdbe547d89fe60 100644 (file)
--- a/citadel/modules/newuser/serv_newuser.c
+++ b/citadel/modules/newuser/serv_newuser.c
@@ -1,24 +1,22 @@
 /*
- * $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-2012 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 open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ * 
+ * 
  *
- *  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
+ * 
+ * 
+ * 
  */
 
 /*
@@ -51,22 +49,21 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+
+#include "ctdl_module.h"
+
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 
 
-#include "ctdl_module.h"
-
 
 
-extern struct CitContext *ContextList;
 
 
 /*
@@ -83,13 +80,13 @@ void CopyNewUserGreetings(void) {
        if (CC->user.timescalled != 1) return;
 
        /* This user's mailbox. */
-       MailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM);
+       CtdlMailboxName(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 (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 +98,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. */
@@ -116,6 +113,6 @@ CTDL_MODULE_INIT(newuser)
                CtdlRegisterSessionHook(CopyNewUserGreetings, EVT_LOGIN);
        }
        
-       /* return our Subversion id for the Log */
-       return "$Id$";
+       /* return our module name for the log */
+       return "newuser";
 }