X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=eef125c7266bf59e6bbfd97dac1a4eb8826f114d;hb=a6661f91205678c55c1e14511d73c376d3b3d90e;hp=327270bccff88f7b5aedd85415d43ce0be9674bb;hpb=4eb74b26380dfde31c86c685f0589e0c653aebf0;p=citadel.git

diff --git a/citadel/control.c b/citadel/control.c
index 327270bcc..eef125c72 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -110,7 +110,7 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data)
 		room_fixed = 1;
 	}
 		
-	getroom (&room, qrbuf->QRname);
+	CtdlGetRoom (&room, qrbuf->QRname);
 	
 	/* Load the message list */
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long));
@@ -232,7 +232,7 @@ void check_control(void)
 	CtdlLogPrintf(CTDL_INFO, "Checking/re-building control record\n");
 	get_control();
 	// Find highest room number and message number.
-	ForEachRoom(control_find_highest, NULL);
+	CtdlForEachRoom(control_find_highest, NULL);
 	ForEachUser(control_find_user, NULL);
 	put_control();
 }
@@ -666,10 +666,10 @@ void cmd_conf(char *argbuf)
 		snprintf(buf, sizeof buf,
 			 "The global system configuration has been edited by %s.\n",
 			 CC->curr_user);
-		aide_message(buf,"Citadel Configuration Manager Message");
+		CtdlAideMessage(buf,"Citadel Configuration Manager Message");
 
 		if (!IsEmptyStr(config.c_logpages))
-			create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
+			CtdlCreateRoom(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
 
 		/* If full text indexing has been disabled, invalidate the
 		 * index so it doesn't try to use it later.
@@ -719,7 +719,9 @@ void cmd_conf(char *argbuf)
 
 CTDL_MODULE_INIT(control)
 {
-	CtdlRegisterProtoHook(cmd_conf, "CONF", "Autoconverted. TODO: document me.");
+	if (!threading) {
+		CtdlRegisterProtoHook(cmd_conf, "CONF", "Autoconverted. TODO: document me.");
+	}
 	/* return our Subversion id for the Log */
 	return "$Id$";
 }