More removal of $Id$ tags

[citadel.git] / citadel / modules / inetcfg / serv_inetcfg.c

diff --git a/citadel/modules/inetcfg/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c
index eaab32d370102438debb031c02257f72813cc933..1e74c1df624173df4f4450c6597e6713301d1a76 100644 (file)
--- a/citadel/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/modules/inetcfg/serv_inetcfg.c
@@ -1,11 +1,24 @@
 /*
- * $Id$ 
- *
  * This module handles the loading/saving and maintenance of the
  * system's Internet configuration.  It's not an optional component; I
  * wrote it as a module merely to keep things as clean and loosely coupled
  * as possible.
  *
+ * 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
  */
 
 #include "sysdep.h"
@@ -32,17 +45,15 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
-#include "tools.h"
 #include "internet_addressing.h"
 #include "genstamp.h"
 #include "domain.h"
@@ -62,7 +73,7 @@ void inetcfg_setTo(struct CtdlMessage *msg) {
                do {
                        extract_token(buf, conf, 0, '\n', sizeof buf);
                        strcpy(conf, &conf[strlen(buf)+1]);
-               } while ( (strlen(conf)>0) && (strlen(buf)>0) );
+               } while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) );
 
                if (inetcfg != NULL) free(inetcfg);
                inetcfg = conf;
@@ -163,7 +174,7 @@ void spamstrings_init_backend(long msgnum, void *userdata) {
 
 
 void inetcfg_init(void) {
-       if (getroom(&CC->room, SYSCONFIGROOM) != 0) return;
+       if (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) return;
        CtdlForEachMessage(MSGS_LAST, 1, NULL, INTERNETCFG, NULL,
                inetcfg_init_backend, NULL);
 }
@@ -178,10 +189,13 @@ void inetcfg_init(void) {
 
 CTDL_MODULE_INIT(inetcfg)
 {
-       CtdlRegisterMessageHook(inetcfg_aftersave, EVT_AFTERSAVE);
-       inetcfg_init();
-
+       if (!threading)
+       {
+               CtdlRegisterMessageHook(inetcfg_aftersave, EVT_AFTERSAVE);
+               inetcfg_init();
+       }
+       
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "inetcfg";
 }