Removed err_* and sln_* functions; replaced all calls with scr_* functions.

[citadel.git] / citadel / textclient / tuiconfig.c

diff --git a/citadel/textclient/tuiconfig.c b/citadel/textclient/tuiconfig.c
index a6cfde35281361a0879e5c71e529de61a7d49e6d..093a5d3a5cb4790c66b1ae89cea767327ca1e7c6 100644 (file)
--- a/citadel/textclient/tuiconfig.c
+++ b/citadel/textclient/tuiconfig.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Configuration screens that are part of the text mode client.
  *
  */
@@ -63,7 +62,7 @@ extern int screenwidth;
 void do_system_configuration(CtdlIPC *ipc)
 {
 
-#define NUM_CONFIGS 67
+#define NUM_CONFIGS 68
 
        char buf[256];
        char sc[NUM_CONFIGS][256];
@@ -116,6 +115,9 @@ void do_system_configuration(CtdlIPC *ipc)
                atoi(&sc[29][0]))));
        strprompt("Initial access level for new users", &sc[6][0], 1);
        strprompt("Access level required to create rooms", &sc[19][0], 1);
+       snprintf(sc[67], sizeof sc[67], "%d", (boolprompt(
+               "Allow anonymous guest logins",
+               atoi(&sc[67][0]))));
        snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
                "Automatically give room aide privs to a user who creates a private room",
                atoi(&sc[4][0]))));
@@ -165,7 +167,7 @@ void do_system_configuration(CtdlIPC *ipc)
                "Automatically delete committed database logs",
                atoi(&sc[43][0]))));
 
-       strprompt("Server IP address (0.0.0.0 for 'any')", &sc[37][0], 15);
+       strprompt("Server IP address (* for 'any')", &sc[37][0], 15);
        strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
        strprompt("POP3S server port (-1 to disable)", &sc[40][0], 5);
        strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
@@ -357,7 +359,7 @@ void do_system_configuration(CtdlIPC *ipc)
                        r += 1 + strlen(sc[a]);
                resp = (char *)calloc(1, r);
                if (!resp) {
-                       err_printf("Can't save config - out of memory!\n");
+                       scr_printf("Can't save config - out of memory!\n");
                        logoff(ipc, 1);
                }
                for (a = 0; a < NUM_CONFIGS; a++) {
@@ -366,18 +368,18 @@ void do_system_configuration(CtdlIPC *ipc)
                }
                r = CtdlIPCSetSystemConfig(ipc, resp, buf);
                if (r / 100 != 4) {
-                       err_printf("%s\n", buf);
+                       scr_printf("%s\n", buf);
                }
                free(resp);
 
                r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, site_expirepolicy, buf);
                if (r / 100 != 2) {
-                       err_printf("%s\n", buf);
+                       scr_printf("%s\n", buf);
                }
 
                r = CtdlIPCSetMessageExpirationPolicy(ipc, 3, mbx_expirepolicy, buf);
                if (r / 100 != 2) {
-                       err_printf("%s\n", buf);
+                       scr_printf("%s\n", buf);
                }
 
        }
@@ -393,27 +395,30 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
        int sel;
 
        keyopt(" <1> localhost      (Alias for this computer)\n");
-       keyopt(" <2> smart-host     (Forward all outbound mail to this host)\n");
-       keyopt(" <3> directory      (Consult the Global Address Book)\n");
-       keyopt(" <4> SpamAssassin   (Address of SpamAssassin server)\n");
-       keyopt(" <5> RBL            (domain suffix of spam hunting RBL)\n");
-       keyopt(" <6> masq domains   (Domains as which users are allowed to masquerade)\n");
-       keyopt(" <7> ClamAV         (Address of ClamAV clamd server)\n");
+       keyopt(" <2> smart host     (Forward all outbound mail to this host)\n");
+       keyopt(" <3> fallback host  (Send mail to this host only if direct delivery fails)\n");
+       keyopt(" <4> directory      (Consult the Global Address Book)\n");
+       keyopt(" <5> SpamAssassin   (Address of SpamAssassin server)\n");
+       keyopt(" <6> RBL            (domain suffix of spam hunting RBL)\n");
+       keyopt(" <7> masq domains   (Domains as which users are allowed to masquerade)\n");
+       keyopt(" <8> ClamAV         (Address of ClamAV clamd server)\n");
        sel = intprompt("Which one", 1, 1, 7);
        switch(sel) {
                case 1: strcpy(buf, "localhost");
                        return;
                case 2: strcpy(buf, "smarthost");
                        return;
-               case 3: strcpy(buf, "directory");
+               case 3: strcpy(buf, "fallbackhost");
                        return;
-               case 4: strcpy(buf, "spamassassin");
+               case 4: strcpy(buf, "directory");
                        return;
-               case 5: strcpy(buf, "rbl");
+               case 5: strcpy(buf, "spamassassin");
                        return;
-               case 6: strcpy(buf, "masqdomain");
+               case 6: strcpy(buf, "rbl");
                        return;
-               case 7: strcpy(buf, "clamav");
+               case 7: strcpy(buf, "masqdomain");
+                       return;
+               case 8: strcpy(buf, "clamav");
                        return;
        }
 }
@@ -501,7 +506,7 @@ void do_internet_configuration(CtdlIPC *ipc)
                                        r += 1 + strlen(recs[i]);
                                resp = (char *)calloc(1, r);
                                if (!resp) {
-                                       err_printf("Can't save config - out of memory!\n");
+                                       scr_printf("Can't save config - out of memory!\n");
                                        logoff(ipc, 1);
                                }
                                if (num_recs) for (i = 0; i < num_recs; i++) {
@@ -510,7 +515,7 @@ void do_internet_configuration(CtdlIPC *ipc)
                                }
                                r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
                                if (r / 100 != 4) {
-                                       err_printf("%s\n", buf);
+                                       scr_printf("%s\n", buf);
                                } else {
                                        scr_printf("Wrote %d records.\n", num_recs);
                                        modified = 0;
@@ -564,7 +569,7 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
 
        tempfp = fopen(filename, "w");
        if (tempfp == NULL) {
-               err_printf("Cannot open %s: %s\n", filename, strerror(errno));
+               scr_printf("Cannot open %s: %s\n", filename, strerror(errno));
                return;
        }
 
@@ -620,7 +625,7 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
        }
 
        if (file_checksum(filename) == cksum) {
-               err_printf("*** No changes to save.\n");
+               scr_printf("*** No changes to save.\n");
                e_ex_code = 1;
        }
 
@@ -773,7 +778,7 @@ void do_ignet_configuration(CtdlIPC *ipc) {
                                        r += 1 + strlen(recs[i]);
                                listing = (char*) calloc(1, r);
                                if (!listing) {
-                                       err_printf("Can't save config - out of memory!\n");
+                                       scr_printf("Can't save config - out of memory!\n");
                                        logoff(ipc, 1);
                                }
                                if (num_recs) for (i = 0; i < num_recs; ++i) {
@@ -898,7 +903,7 @@ void do_filterlist_configuration(CtdlIPC *ipc)
                                        r += 1 + strlen(recs[i]);
                                listing = (char*) calloc(1, r);
                                if (!listing) {
-                                       err_printf("Can't save config - out of memory!\n");
+                                       scr_printf("Can't save config - out of memory!\n");
                                        logoff(ipc, 1);
                                }
                                if (num_recs) for (i = 0; i < num_recs; ++i) {
@@ -1048,7 +1053,7 @@ void do_pop3client_configuration(CtdlIPC *ipc)
                                }
                                listing = (char*) calloc(1, r);
                                if (!listing) {
-                                       err_printf("Can't save config - out of memory!\n");
+                                       scr_printf("Can't save config - out of memory!\n");
                                        logoff(ipc, 1);
                                }
                                if (num_recs) for (i = 0; i < num_recs; ++i) {
@@ -1193,7 +1198,7 @@ void do_rssclient_configuration(CtdlIPC *ipc)
                                }
                                listing = (char*) calloc(1, r);
                                if (!listing) {
-                                       err_printf("Can't save config - out of memory!\n");
+                                       scr_printf("Can't save config - out of memory!\n");
                                        logoff(ipc, 1);
                                }
                                if (num_recs) for (i = 0; i < num_recs; ++i) {