diff --git a/ChangeLog b/ChangeLog index a73b0cfc..8cf3bb9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,8 @@ v0.51.4 11-Apr-2004 Added new experimental files database code which will only be used if configured with --enable-experiment. Message group setup now sets mode 660 for ~/etc/mgroups.data. + In menu 1.2 removed Omen Id that was not used. + In menu 18 removed settings for ISP connect and hangup. mbtask: Removed debug logging for the disk thread. diff --git a/html/images/taskmgr.png b/html/images/taskmgr.png index 723e92c4..91db29d2 100644 Binary files a/html/images/taskmgr.png and b/html/images/taskmgr.png differ diff --git a/html/setup/global.html b/html/setup/global.html index 6faea0ff..15f74236 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -14,7 +14,7 @@
-
Last update 17-Mar-2004
+
Last update 19-May-2004

MBSE BBS Setup - Global Setup

In this setup you can edit all global settings for MBSE BBS. All sections will @@ -38,7 +38,6 @@ group them. Sysop Fido The Fidonet name of your Sysop account Location The Location of your BBS QWK/Bluewave The packet name for Offline mail downloads. -Omed id. Not in use Comment A comment line for your BBS Origin line The default origin line for echomail Startup uid The default username "bbs" diff --git a/html/setup/taskmgr.html b/html/setup/taskmgr.html index 3f7681a6..aacb4c7c 100644 --- a/html/setup/taskmgr.html +++ b/html/setup/taskmgr.html @@ -14,7 +14,7 @@
-
Last update 09-Sep-2002
+
Last update 19-May-2004

MBSE BBS Setup - Task Manager.

Introduction

@@ -36,8 +36,6 @@ The behaviour is setup in this screen. Index 3 Nodelist compiler 3 for semafore mbindex. Msglink Action for semafore msglink. Reqindex Action for semafore reqindex. -ISP conn Not in use yet! -ISP disc Not in use yet! Ping #1 IP address of node to ping to check the internet. Ping #2 IP address of second node to ping to check the internet. Max TCP Maximum simultaneous outgoing calls over the internet. diff --git a/lib/mbselib.h b/lib/mbselib.h index 81230537..0020c9d2 100644 --- a/lib/mbselib.h +++ b/lib/mbselib.h @@ -581,8 +581,8 @@ typedef struct _dual { struct taskrec { float maxload; /* Maximum system load */ - char isp_connect[81]; /* ISP connect command */ - char isp_hangup[81]; /* ISP hangup command */ + char xisp_connect[81]; /* ISP connect command */ + char xisp_hangup[81]; /* ISP hangup command */ char isp_ping1[41]; /* ISP ping host 1 */ char isp_ping2[41]; /* ISP ping host 2 */ @@ -884,7 +884,7 @@ struct sysconfig { char sysop[9]; /* Unix Sysop name */ char location[36]; /* System location */ char bbsid[9]; /* QWK/Bluewave BBS ID */ - char bbsid2[3]; /* Omen filename */ + char xbbsid2[3]; /* Omen filename */ char sysdomain[36]; /* System Domain name */ char comment[56]; /* Do what you like here */ char origin[51]; /* Default origin line */ diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index b1edb054..27061a54 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -138,10 +138,9 @@ void e_reginfo(void) mvprintw(10, 6, "4. Sysop Fido"); mvprintw(11, 6, "5. Location"); mvprintw(12, 6, "6. QWK/Bluewave"); - mvprintw(13, 6, "7. Omen id"); - mvprintw(14, 6, "8. Comment"); - mvprintw(15, 6, "9. Origin line"); - mvprintw(16, 6, "10. Startup uid"); + mvprintw(13, 6, "7. Comment"); + mvprintw(14, 6, "8. Origin line"); + mvprintw(15, 6, "9. Startup uid"); for (;;) { set_color(WHITE, BLACK); @@ -151,12 +150,11 @@ void e_reginfo(void) show_str(10,25,35, CFG.sysop_name); show_str(11,25,35, CFG.location); show_str(12,25, 8, CFG.bbsid); - show_str(13,25, 2, CFG.bbsid2); show_str(14,25,55, CFG.comment); show_str(15,25,50, CFG.origin); show_str(16,25, 8, CFG.startname); - switch(select_menu(10)) { + switch(select_menu(9)) { case 0: return; case 1: E_STR( 7,25,35, CFG.bbs_name, "Name of this ^BBS^ system") case 2: E_STR( 8,25,35, CFG.sysdomain, "Internet ^mail domain^ name of this system") @@ -164,10 +162,9 @@ void e_reginfo(void) case 4: E_STR(10,25,35, CFG.sysop_name, "^Fidonet name^ of the sysop") case 5: E_STR(11,25,35, CFG.location, "^Location^ (city) of this system") case 6: E_UPS(12,25, 8, CFG.bbsid, "^QWK/Bluewave^ packets name") - case 7: E_UPS(13,25, 2, CFG.bbsid2, "^Omen offline^ reader ID characters") - case 8: E_STR(14,25,55, CFG.comment, "Some ^comment^ you may like to give") - case 9: E_STR(15,25,50, CFG.origin, "Default ^origin^ line under echomail messages") - case 10:E_STR(16,25, 8, CFG.startname, "The ^Unix username^ that is used to start the bbs") + case 7: E_STR(13,25,55, CFG.comment, "Some ^comment^ you may like to give") + case 8: E_STR(14,25,50, CFG.origin, "Default ^origin^ line under echomail messages") + case 9: E_STR(15,25, 8, CFG.startname, "The ^Unix username^ that is used to start the bbs") } }; } @@ -1711,7 +1708,6 @@ int global_doc(FILE *fp, FILE *toc, int page) add_webtable(wp, (char *)"Sysop fido name", CFG.sysop_name); add_webtable(wp, (char *)"System location", CFG.location); add_webtable(wp, (char *)"QWK/Bluewave id", CFG.bbsid); - add_webtable(wp, (char *)"Omen id", CFG.bbsid2); add_webtable(wp, (char *)"Comment", CFG.comment); add_webtable(wp, (char *)"Origin line", CFG.origin); add_webtable(wp, (char *)"Start unix name", CFG.startname); @@ -1726,7 +1722,6 @@ int global_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Sysop fido name %s\n", CFG.sysop_name); fprintf(fp, " System location %s\n", CFG.location); fprintf(fp, " QWK/Bluewave id %s\n", CFG.bbsid); - fprintf(fp, " Omen id %s\n", CFG.bbsid2); fprintf(fp, " Comment %s\n", CFG.comment); fprintf(fp, " Origin line %s\n", CFG.origin); fprintf(fp, " Start unix name %s\n", CFG.startname); diff --git a/mbsetup/m_task.c b/mbsetup/m_task.c index 2401e807..25e367c8 100644 --- a/mbsetup/m_task.c +++ b/mbsetup/m_task.c @@ -113,15 +113,13 @@ int EditTask() mvprintw(11, 1, " 6. Index 3"); mvprintw(12, 1, " 7. Msglink"); mvprintw(13, 1, " 8. Reqindex"); - mvprintw(14, 1, " 9. ISP conn"); - mvprintw(15, 1, "10. ISP disc"); - mvprintw(16, 1, "11. Ping #1"); - mvprintw(17, 1, "12. Ping #2"); - mvprintw(18, 1, "13. Max TCP"); - mvprintw(19, 1, "14. Max Load"); + mvprintw(14, 1, " 9. Ping #1"); + mvprintw(15, 1, "10. Ping #2"); + mvprintw(16, 1, "11. Max TCP"); + mvprintw(17, 1, "12. Max Load"); - mvprintw(18,41, "15. ZMH start"); - mvprintw(19,41, "16. ZMH end"); + mvprintw(16,41, "13. ZMH start"); + mvprintw(17,41, "14. ZMH end"); for (;;) { @@ -134,18 +132,16 @@ int EditTask() show_str(11, 15,65, TCFG.cmd_mbindex3); show_str(12, 15,65, TCFG.cmd_msglink); show_str(13, 15,65, TCFG.cmd_reqindex); - show_str(14, 15,65, TCFG.isp_connect); - show_str(15, 15,65, TCFG.isp_hangup); - show_str(16, 15,40, TCFG.isp_ping1); - show_str(17, 15,40, TCFG.isp_ping2); - show_int(18, 15, TCFG.max_tcp); + show_str(14, 15,40, TCFG.isp_ping1); + show_str(15, 15,40, TCFG.isp_ping2); + show_int(16, 15, TCFG.max_tcp); sprintf(temp, "%0.2f", TCFG.maxload); - show_str(19, 15,5, temp); + show_str(17, 15,5, temp); - show_str( 18,56, 5, TCFG.zmh_start); - show_str( 19,56, 5, TCFG.zmh_end); + show_str( 16,56, 5, TCFG.zmh_start); + show_str( 17,56, 5, TCFG.zmh_end); - j = select_menu(16); + j = select_menu(14); switch(j) { case 0: return 0; case 1: E_STR( 6,15,65,TCFG.cmd_mailout, "The command to execute on semafore ^mailout^") @@ -156,16 +152,14 @@ int EditTask() case 6: E_STR( 11,15,65,TCFG.cmd_mbindex3, "The compiler 3 command to execute on semafore ^mbindex^") case 7: E_STR( 12,15,65,TCFG.cmd_msglink, "The command to execute on semafore ^msglink^") case 8: E_STR( 13,15,65,TCFG.cmd_reqindex, "The command to execute on semafore ^reqindex^") - case 9: E_STR( 14,15,65,TCFG.isp_connect, "The command to ^connect^ the Internet Connection") - case 10:E_STR( 15,15,65,TCFG.isp_hangup, "The command to ^hangup^ the Internet Connection") - case 11:E_STR( 16,15,40,TCFG.isp_ping1, "The ^IP address^ of host 1 to check the Internet Connection") - case 12:E_STR( 17,15,40,TCFG.isp_ping2, "The ^IP address^ of host 2 to check the Internet Connection") - case 13:E_INT( 18,15, TCFG.max_tcp, "Maximum simultanous ^TCP/IP^ connections") - case 14:strcpy(temp, edit_str(19,15,5,temp, (char *)"^Maximum system load^ at which processing stops (1.00 .. 3.00)")); + case 9: E_STR( 14,15,40,TCFG.isp_ping1, "The ^IP address^ of host 1 to check the Internet Connection") + case 10:E_STR( 15,15,40,TCFG.isp_ping2, "The ^IP address^ of host 2 to check the Internet Connection") + case 11:E_INT( 16,15, TCFG.max_tcp, "Maximum simultanous ^TCP/IP^ connections") + case 12:strcpy(temp, edit_str(17,15,5,temp, (char *)"^Maximum system load^ at which processing stops (1.00 .. 3.00)")); sscanf(temp, "%f", &TCFG.maxload); break; - case 15:E_STR( 18,56,5, TCFG.zmh_start, "^Start^ of Zone Mail Hour in UTC") - case 16:E_STR( 19,56,5, TCFG.zmh_end, "^End& of Zone Mail Hour in UTC") + case 13:E_STR( 16,56,5, TCFG.zmh_start, "^Start^ of Zone Mail Hour in UTC") + case 14:E_STR( 17,56,5, TCFG.zmh_end, "^End& of Zone Mail Hour in UTC") } } @@ -211,8 +205,6 @@ int task_doc(FILE *fp, FILE *toc, int page) add_webtable(wp, (char *)"Zone Mail Hour start", TCFG.zmh_start); add_webtable(wp, (char *)"Zone Mail Hour end", TCFG.zmh_end); fprintf(wp, " \n"); - add_webtable(wp, (char *)"ISP connect command", TCFG.isp_connect); - add_webtable(wp, (char *)"ISP hangup command", TCFG.isp_hangup); add_webtable(wp, (char *)"ISP ping host 1", TCFG.isp_ping1); add_webtable(wp, (char *)"ISP ping host 2", TCFG.isp_ping2); fprintf(wp, " \n"); @@ -239,8 +231,6 @@ int task_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Zone Mail Hour start %s\n", TCFG.zmh_start); fprintf(fp, " Zone Mail Hour end %s\n\n", TCFG.zmh_end); - fprintf(fp, " ISP connect command %s\n", TCFG.isp_connect); - fprintf(fp, " ISP hangup command %s\n", TCFG.isp_hangup); fprintf(fp, " ISP ping host 1 %s\n", TCFG.isp_ping1); fprintf(fp, " ISP ping host 2 %s\n", TCFG.isp_ping2);