* Auto-creation of various rooms is now done correctly (private, non-mailbox)

* Set up the "Local System Configuration" room and associated API & servcmds

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 06ffc25b0e0434c9c14014f37e701276bf7545cb..43c466b8590458f87b683bbf7cb31b90072318e6 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -56,8 +56,8 @@ void master_startup(void) {
 
        lprintf(7, "Creating base rooms (if necessary)\n");
        create_room(BASEROOM,           0, "", 0);
-       create_room(AIDEROOM,           4, "", 0);
-       create_room(SYSCONFIGROOM,      4, "", 0);
+       create_room(AIDEROOM,           3, "", 0);
+       create_room(SYSCONFIGROOM,      3, "", 0);
        create_room(config.c_twitroom,  0, "", 0);
        }
 

diff --git a/citadel/control.c b/citadel/control.c
index 2d2c9533400d93600cfa19f2b7045354b2ba9d98..7a354cc6f4b02eb83de19f2e9a3a2ae70139d244 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -254,7 +254,7 @@ void cmd_conf(char *argbuf) {
                aide_message(buf);
 
                if (strlen(config.c_logpages) > 0)
-                       create_room(config.c_logpages, 4, "", 0);
+                       create_room(config.c_logpages, 3, "", 0);
                }
 
        else if (!strcasecmp(cmd, "GETSYS")) {

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1bb075bd6892699740ddaa501cc2320a00a4b78d..f499e440f1289e3094b26fec4b9ea9c17ad6b0cb 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2411,8 +2411,10 @@ char *CtdlGetSysConfig(char *sysconfname) {
 
        getroom(&CC->quickroom, hold_rm);
 
+       lprintf(9, "eggstracting...\n");
        if (conf != NULL) do {
                extract_token(buf, conf, 0, '\n');
+               lprintf(9, "eggstracted <%s>\n", buf);
                strcpy(conf, &conf[strlen(buf)+1]);
        } while ( (strlen(conf)>0) && (strlen(buf)>0) );
 
@@ -2427,14 +2429,11 @@ void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) {
 
        fp = fopen(temp, "w");
        if (fp == NULL) return;
-       fprintf(fp, "Content-type: %s\n\n", sysconfname);
        fprintf(fp, "%s", sysconfdata);
        fclose(fp);
 
        /* this handy API function does all the work for us */
-       CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp,
-               &CC->usersupp, 0, 1, 0);
-
+       CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp, NULL, 0, 1, 0);
        unlink(temp);
 }