From 19bcce90ab610d89001d4bd75d3c441717911bbd Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sun, 14 Oct 2007 13:27:55 +0000 Subject: [PATCH] Blocked selection of FTN and Usenet moderated message areas --- ChangeLog | 3 +++ html/setup/emareas.html | 4 +-- mbsetup/ledit.c | 55 ++++++++++++++++++++++------------------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f9be67b..3f3d9fca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ v0.91.13 12-Oct-2007 mbnewusr: Added GeoIP support. + mbsetup: + Blocked selection of FTN and Usenet moderated message areas. + v0.91.12 24-Sep-2007 - 12-Oct-2007 diff --git a/html/setup/emareas.html b/html/setup/emareas.html index 7512359e..d18adb1a 100644 --- a/html/setup/emareas.html +++ b/html/setup/emareas.html @@ -14,7 +14,7 @@
-
Last update 23-Feb-2004
+
Last update 14-Oct-2007

MBSE BBS Setup - Mail Setup -> Mail Areas.

Introduction.

@@ -47,7 +47,7 @@ change netmail reply board and delete message area. QWK name The name of the area for OffLine Readers. Distrib. Leave this blank for now! Area Type Local, Netmail, Echomail or News. -Msg Kinds Private/Public, Private, Public, Read Only, FTN moderated, Usenet Moderated +Msg Kinds Private/Public, Private, Public, Read Only. Charset Default characterset for the area Active If this area is active. Days Old The maximum age of the messages before purging. diff --git a/mbsetup/ledit.c b/mbsetup/ledit.c index 09852e17..eca1dc5a 100644 --- a/mbsetup/ledit.c +++ b/mbsetup/ledit.c @@ -1626,15 +1626,15 @@ int edit_emailmode(int y, int x, int val) char *getmsgkinds(int val) { - switch (val) { - case BOTH: return (char *)"Private/Public "; - case PRIVATE: return (char *)"Private only "; - case PUBLIC: return (char *)"Public only "; - case RONLY: return (char *)"Read Only "; - case FTNMOD: return (char *)"FTN moderated "; - case USEMOD: return (char *)"Usenet moderated"; - default: return NULL; - } + switch (val) { + case BOTH: return (char *)"Private/Public "; + case PRIVATE: return (char *)"Private only "; + case PUBLIC: return (char *)"Public only "; + case RONLY: return (char *)"Read Only "; + case FTNMOD: return (char *)"FTN_mod obsolete"; + case USEMOD: return (char *)"USE_mod obsolete"; + default: return NULL; + } } @@ -1648,25 +1648,28 @@ void show_msgkinds(int y, int x, int val) int edit_msgkinds(int y, int x, int val) { - int ch; + int ch; - showhelp((char *)"Toggle ^Message Kinds^ with spacebar, press whene done."); - do { - set_color(YELLOW, BLUE); - show_msgkinds(y, x, val); - - ch = readkey(y, x, YELLOW, BLUE); - - if (ch == ' ') { - if (val < USEMOD) - val++; - else - val = BOTH; - } - } while (ch != KEY_ENTER && ch != '\012'); - set_color(WHITE, BLACK); + showhelp((char *)"Toggle ^Message Kinds^ with spacebar, press whene done."); + do { + set_color(YELLOW, BLUE); show_msgkinds(y, x, val); - return val; + + ch = readkey(y, x, YELLOW, BLUE); + + if (ch == ' ') { + /* + * Node, defined upto USEMOD, but we only use upto RONLY. + */ + if (val < RONLY) + val++; + else + val = BOTH; + } + } while (ch != KEY_ENTER && ch != '\012'); + set_color(WHITE, BLACK); + show_msgkinds(y, x, val); + return val; }