From 4f39a1a5d0b33c494066c9891edd2fef6d6ff4c9 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Mon, 15 Apr 2002 13:38:35 +0000 Subject: [PATCH] Structure changes for new file groups --- ChangeLog | 4 + lib/structs.h | 27 +++--- mbsetup/Makefile | 2 +- mbsetup/m_fgroup.c | 237 +++++++++++++++++++++++++++++++++------------ mbsetup/m_global.c | 60 ++---------- mbtask/mbtask.c | 10 -- 6 files changed, 203 insertions(+), 137 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9217b88d..7999e4d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4604,6 +4604,8 @@ v0.33.20 10-Feb-2002 for finding this one and implement it into mbse bbs. Splitted the No TCP settings in No IBN, No IFC and No ITN. Removed settings for Non-hold mail and Pickup Primary. + Removed several setting for http setup, this is now handled + by the macro templates. common.a: Added 2 functions to return the OS name and CPU family. @@ -4646,6 +4648,8 @@ v0.33.20 10-Feb-2002 nodes setup. When editing a new message area, and the area was made active, all entered data was erased. + Removed setting for http setup which are now in the macro + templates. mbfido: In AreaMgr and FileMgr changed aka matching for area diff --git a/lib/structs.h b/lib/structs.h index 1bd27902..cf283f0a 100644 --- a/lib/structs.h +++ b/lib/structs.h @@ -754,18 +754,18 @@ struct sysconfig { char www_link2ftp[21]; /* Link name to ftp_base */ char www_url[41]; /* Webserver URL */ char www_charset[21]; /* Default characher set */ - char www_tbgcolor[21]; /* Table bgcolor */ - char www_hbgcolor[21]; /* Header bgcolor */ + char xwww_tbgcolor[21]; + char xwww_hbgcolor[21]; char www_author[41]; /* Author name in pages */ char www_convert[81]; /* Graphic Convert command */ - char www_icon_home[21]; /* Icon for Home */ - char www_name_home[21]; /* String for Home */ - char www_icon_back[21]; /* Icon for Back */ - char www_name_back[21]; /* String for Back */ - char www_icon_prev[21]; /* Icon for previous page */ - char www_name_prev[21]; /* String for previous page */ - char www_icon_next[21]; /* Icon for next page */ - char www_name_next[21]; /* String for next page */ + char xwww_icon_home[21]; + char xwww_name_home[21]; + char xwww_icon_back[21]; + char xwww_name_back[21]; + char xwww_icon_prev[21]; + char xwww_name_prev[21]; + char xwww_icon_next[21]; + char xwww_name_next[21]; int www_files_page; /* Files per webpage */ fidoaddr EmailFidoAka; /* Email aka in fidomode */ @@ -1256,24 +1256,25 @@ struct _fgroup { unsigned FileGate : 1; /* List is in filegate fmt */ unsigned AutoChange : 1; /* Auto add/del areas */ unsigned UserChange : 1; /* User add/del areas */ - unsigned ShowAll : 1; /* Show all areas in lists */ unsigned Replace : 1; /* Allow replace */ unsigned DupCheck : 1; /* Dupe Check */ unsigned Secure : 1; /* Check for secure system */ - unsigned NoToch : 1; /* Don't touch filedates */ + unsigned NoTouch : 1; /* Don't touch filedates */ unsigned VirScan : 1; /* Run Virus scanners */ unsigned Announce : 1; /* Announce files */ unsigned UpdMagic : 1; /* Update Magic database */ unsigned FileId : 1; /* Check FILE_ID.DIZ */ unsigned ConvertAll : 1; /* Convert always */ unsigned SendOrg : 1; /* Send original file */ + unsigned xRes6 : 1; unsigned xRes7 : 1; unsigned xRes8 : 1; - char BasePath[64]; /* File area base path */ + char BasePath[65]; /* File area base path */ securityrec DLSec; /* Download Security */ securityrec UPSec; /* Upload Security */ securityrec LTSec; /* List Security */ char BbsGroup[13]; /* BBS Group */ + char AnnGroup[13]; /* BBS Announce Group */ unsigned Upload; /* Upload area */ }; diff --git a/mbsetup/Makefile b/mbsetup/Makefile index 51ad2f67..885069ac 100644 --- a/mbsetup/Makefile +++ b/mbsetup/Makefile @@ -72,7 +72,7 @@ depend: # Dependencies generated by make depend grlist.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h screen.h grlist.h ledit.h m_domain.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_menu.h m_domain.h -m_fgroup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_ticarea.h m_fgroup.h +m_fgroup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_archive.h m_ngroup.h m_ticarea.h m_fgroup.h m_lang.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_lang.h m_marea.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h screen.h mutil.h ledit.h grlist.h m_global.h m_node.h m_mgroup.h m_marea.h m_new.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h grlist.h m_new.h m_lang.h m_marea.h m_ngroup.h diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c index 4e7f613d..c164c36a 100644 --- a/mbsetup/m_fgroup.c +++ b/mbsetup/m_fgroup.c @@ -40,6 +40,8 @@ #include "stlist.h" #include "m_global.h" #include "m_node.h" +#include "m_archive.h" +#include "m_ngroup.h" #include "m_ticarea.h" #include "m_fgroup.h" @@ -217,6 +219,11 @@ int AppendFGroup(void) memset(&fgroup, 0, sizeof(fgroup)); fgroup.StartDate = time(NULL); fgroup.DivideCost = TRUE; + fgroup.FileGate = TRUE; + fgroup.Secure = TRUE; + fgroup.VirScan = TRUE; + fgroup.Announce = TRUE; + fgroup.FileId = TRUE; fwrite(&fgroup, sizeof(fgroup), 1, fil); fclose(fil); FGrpUpdated = 1; @@ -252,19 +259,44 @@ void FgScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "10.1 EDIT FILE GROUP"); + mvprintw( 4, 2, "10.1 EDIT FILE GROUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Name"); - mvprintw( 8, 6, "2. Comment"); - mvprintw( 9, 6, "3. Active"); - mvprintw(10, 6, "4. Use Aka"); - mvprintw(11, 6, "5. Uplink"); - mvprintw(12, 6, "6. Areas"); - mvprintw(13, 6, "7. Unit Cost"); - mvprintw(14, 6, "8. Unit Size"); - mvprintw(15, 6, "9. Add Prom."); - mvprintw(16, 6, "10. Divide"); - mvprintw(17, 6, "11. Deleted"); + mvprintw( 6, 2, "1. Name"); + mvprintw( 7, 2, "2. Comment"); + mvprintw( 8, 2, "3. Base path"); + mvprintw( 9, 2, "4. Use Aka"); + mvprintw(10, 2, "5. Uplink"); + mvprintw(11, 2, "6. Areas"); + mvprintw(12, 2, "7. Filegate"); + mvprintw(13, 2, "8. Banner"); + mvprintw(14, 2, "9. Convert"); + mvprintw(15, 2, "10. BBS group"); + mvprintw(16, 2, "11. New group"); + mvprintw(17, 2, "12. Active"); + mvprintw(18, 2, "13. Deleted"); + mvprintw(19, 2, "14. Start at"); + + mvprintw(11,32, "15. Unit Cost"); + mvprintw(12,32, "16. Unit Size"); + mvprintw(13,32, "17. Add Prom."); + mvprintw(14,32, "18. Divide"); + mvprintw(15,32, "19. Auto chng"); + mvprintw(16,32, "20. User chng"); + mvprintw(17,32, "21. Replace"); + mvprintw(18,32, "22. Dupecheck"); + mvprintw(19,32, "23. Secure"); + + mvprintw( 9,56, "24. No touch"); + mvprintw(10,56, "25. Virscan"); + mvprintw(11,56, "26. Announce"); + mvprintw(12,56, "27. Upd magic"); + mvprintw(13,56, "28. File ID"); + mvprintw(14,56, "29. Conv. all"); + mvprintw(15,56, "30. Send orig"); + mvprintw(16,56, "31. DL sec"); + mvprintw(17,56, "32. UP sec"); + mvprintw(18,56, "33. LT sec"); + mvprintw(19,56, "34. Upl. area"); } @@ -305,19 +337,44 @@ int EditFGrpRec(int Area) for (;;) { set_color(WHITE, BLACK); - show_str( 7,20,12, fgroup.Name); - show_str( 8,20,55, fgroup.Comment); - show_bool( 9,20, fgroup.Active); - show_aka( 10,20, fgroup.UseAka); - show_aka( 11,20, fgroup.UpLink); - show_str( 12,20,12, fgroup.AreaFile); - show_int( 13,20, fgroup.UnitCost); - show_int( 14,20, fgroup.UnitSize); - show_int( 15,20, fgroup.AddProm); - show_bool(16,20, fgroup.DivideCost); - show_bool(17,20, fgroup.Deleted); + show_str( 6,16,12, fgroup.Name); + show_str( 7,16,55, fgroup.Comment); + show_str( 8,16,64, fgroup.BasePath); + show_aka( 9,16, fgroup.UseAka); + show_aka( 10,16, fgroup.UpLink); + show_str( 11,16,12, fgroup.AreaFile); + show_bool(12,16, fgroup.FileGate); + show_str( 13,16,14, fgroup.Banner); + show_str( 14,16,5, fgroup.Convert); + show_str( 15,16,12, fgroup.BbsGroup); + show_str( 16,16,12, fgroup.AnnGroup); + show_bool(17,16, fgroup.Active); + show_bool(18,16, fgroup.Deleted); + show_int( 19,16, fgroup.StartArea); - j = select_menu(11); + show_int( 11,46, fgroup.UnitCost); + show_int( 12,46, fgroup.UnitSize); + show_int( 13,46, fgroup.AddProm); + show_bool(14,46, fgroup.DivideCost); + show_bool(15,46, fgroup.AutoChange); + show_bool(16,46, fgroup.UserChange); + show_bool(17,46, fgroup.Replace); + show_bool(18,46, fgroup.DupCheck); + show_bool(19,46, fgroup.Secure); + + show_bool( 9,70, fgroup.NoTouch); + show_bool(10,70, fgroup.VirScan); + show_bool(11,70, fgroup.Announce); + show_bool(12,70, fgroup.UpdMagic); + show_bool(13,70, fgroup.FileId); + show_bool(14,70, fgroup.ConvertAll); + show_bool(15,70, fgroup.SendOrg); + show_int( 16,70, fgroup.DLSec.level); + show_int( 17,70, fgroup.UPSec.level); + show_int( 18,70, fgroup.LTSec.level); + show_int( 19,70, fgroup.Upload); + + j = select_menu(34); switch(j) { case 0: crc1 = 0xffffffff; @@ -342,11 +399,9 @@ int EditFGrpRec(int Area) case 1: if (CheckFgroup()) break; - E_UPS( 7,20,12,fgroup.Name, "The ^name^ of this file group") - case 2: E_STR( 8,20,55,fgroup.Comment, "The ^description^ of this file group") - case 3: if (CheckFgroup()) - break; - E_BOOL( 9,20, fgroup.Active, "Is this file group ^active^") + E_UPS( 6,16,12,fgroup.Name, "The ^name^ of this file group") + case 2: E_STR( 7,16,55,fgroup.Comment, "The ^description^ of this file group") + case 3: E_PTH( 8,16,64,fgroup.BasePath, "The ^base path^ for new created file areas") case 4: tmp = PickAka((char *)"10.1.4", TRUE); if (tmp != -1) fgroup.UseAka = CFG.aka[tmp]; @@ -355,14 +410,47 @@ int EditFGrpRec(int Area) case 5: fgroup.UpLink = PullUplink((char *)"10.1.5"); FgScreen(); break; - case 6: E_STR( 12,20,12,fgroup.AreaFile, "The name of the ^Areas File^ from the uplink") - case 7: E_INT( 13,20, fgroup.UnitCost, "The ^cost per size unit^ for this file") - case 8: E_INT( 14,20, fgroup.UnitSize, "The ^unit size^ in KBytes, 0 means cost per file") - case 9: E_INT( 15,20, fgroup.AddProm, "The ^Promillage^ to add or substract of the filecost") - case 10:E_BOOL(16,20, fgroup.DivideCost, "^Divide^ the cost over all downlinks or charge each link full cost") - case 11:if (CheckFgroup()) + case 6: E_STR( 11,16,12,fgroup.AreaFile, "The name of the ^Areas File^ from the uplink") + case 7: E_BOOL(12,16, fgroup.FileGate, "Is the areas file in ^filegate.zxx^ format") + case 8: E_STR( 13,16,14,fgroup.Banner, "The ^banner^ to add to the archives") + case 9: strcpy(fgroup.Convert, PickArchive((char *)"10.1.9")); + FgScreen(); + break; + case 10:strcpy(fgroup.BbsGroup, PickFGroup((char *)"8.4.17")); + FgScreen(); + break; + case 11:strcpy(fgroup.AnnGroup, PickNGroup((char *)"8.4.18")); + FgScreen(); + break; + case 12:if (CheckFgroup()) + break; + E_BOOL(17,16, fgroup.Active, "Is this file group ^active^") + case 13:if (CheckFgroup()) break; - E_BOOL(17,20, fgroup.Deleted, "Is this file group ^Deleted^") + E_BOOL(18,16, fgroup.Deleted, "Is this file group ^Deleted^") + case 14:E_INT( 19,16, fgroup.StartArea, "The ^start area^ to create new BBS areas") + + case 15:E_INT( 11,46, fgroup.UnitCost, "The ^cost per size unit^ files received in this tic group") + case 16:E_INT( 12,46, fgroup.UnitSize, "The ^unit size^ in KBytes, 0 means cost per file in this tic group") + case 17:E_INT( 13,46, fgroup.AddProm, "The ^Promillage^ to add or substract of the filecost") + case 18:E_BOOL(14,46, fgroup.DivideCost, "^Divide^ the cost over all downlinks or charge each link full cost") + case 19:E_BOOL(15,46, fgroup.AutoChange, "^Automatic change areas^ when a new arealist is received") + case 20:E_BOOL(16,46, fgroup.UserChange, "Create new areas when ^users^ request new tic areas") + case 21:E_BOOL(17,46, fgroup.Replace, "Set ^Replace^ in new created tic areas") + case 22:E_BOOL(18,46, fgroup.DupCheck, "Set ^Dupe check^ in new created tic areas") + case 23:E_BOOL(19,46, fgroup.Secure, "Set ^Secure^ tic processing in new created tic areas") + + case 24:E_BOOL( 9,70, fgroup.NoTouch, "Set ^Don't touch filedate^ in new created tic areas") + case 25:E_BOOL(10,70, fgroup.VirScan, "Set ^Virus scanner^ in new created tic areas") + case 26:E_BOOL(11,70, fgroup.Announce, "Set ^Announce files^ in new created tic areas") + case 27:E_BOOL(12,70, fgroup.UpdMagic, "Set ^Update magic^ in new created tic areas") + case 28:E_BOOL(13,70, fgroup.FileId, "Set ^FILE_ID.DIZ extract^ in new created tic areas") + case 29:E_BOOL(14,70, fgroup.ConvertAll, "Set ^Convert All^ setting in new created tic areas") + case 30:E_BOOL(15,70, fgroup.SendOrg, "Set ^Send original^ setting in new created tic areas") + case 31:E_SEC( 16,70, fgroup.DLSec, "10.1.31 FILE GROUP DOWNLOAD SECURITY", FgScreen) + case 32:E_SEC( 17,70, fgroup.UPSec, "10.1.32 FILE GROUP UPLOAD SECURITY", FgScreen) + case 33:E_SEC( 18,70, fgroup.LTSec, "10.1.33 FILE GROUP LIST SECURITY", FgScreen) + case 34:E_INT( 19,70, fgroup.Upload, "Set the default ^Upload area^ in new created file areas") } } @@ -572,44 +660,67 @@ char *PickFGroup(char *shdr) int tic_group_doc(FILE *fp, FILE *toc, int page) { - char temp[PATH_MAX]; + char *temp; FILE *no; - int j; + int First = TRUE;; + temp = calloc(PATH_MAX, sizeof(char)); sprintf(temp, "%s/etc/fgroups.data", getenv("MBSE_ROOT")); - if ((no = fopen(temp, "r")) == NULL) - return page; - - addtoc(fp, toc, 10, 1, page, (char *)"File processing groups"); - j = 0; - fprintf(fp, "\n\n"); + if ((no = fopen(temp, "r")) == NULL) { + free(temp); + return page; + } + free(temp); fread(&fgrouphdr, sizeof(fgrouphdr), 1, no); fseek(no, 0, SEEK_SET); fread(&fgrouphdr, fgrouphdr.hdrsize, 1, no); while ((fread(&fgroup, fgrouphdr.recsize, 1, no)) == 1) { - if (j == 3) { - page = newpage(fp, page); - fprintf(fp, "\n"); - j = 0; + if (First) { + addtoc(fp, toc, 10, 1, page, (char *)"File processing groups"); + First = FALSE; + fprintf(fp, "\n"); + } else { + page = newpage(fp, page); + fprintf(fp, "\n\n"); } - fprintf(fp, " Name %s\n", fgroup.Name); - fprintf(fp, " Comment %s\n", fgroup.Comment); - fprintf(fp, " Active %s\n", getboolean(fgroup.Active)); - fprintf(fp, " Use Aka %s\n", aka2str(fgroup.UseAka)); - fprintf(fp, " Uplink %s\n", aka2str(fgroup.UpLink)); - fprintf(fp, " Areas file %s\n", fgroup.AreaFile); - fprintf(fp, " Start date %s", ctime(&fgroup.StartDate)); - fprintf(fp, " Last date %s\n", ctime(&fgroup.LastDate)); - -// fprintf(fp, " Total This month Last month\n"); -// fprintf(fp, " ---------- ---------- ----------\n"); -// fprintf(fp, " Files %-10ld %-10ld %-10ld\n", fgroup.Total.files, fgroup.ThisMonth.files, fgroup.LastMonth.files); -// fprintf(fp, " KBytes %-10ld %-10ld %-10ld\n", fgroup.Total.kbytes, fgroup.ThisMonth.kbytes, fgroup.LastMonth.kbytes); - fprintf(fp, "\n\n\n"); - j++; + fprintf(fp, " Group name %s\n", fgroup.Name); + fprintf(fp, " Comment %s\n", fgroup.Comment); + fprintf(fp, " Active %s\n", getboolean(fgroup.Active)); + fprintf(fp, " Use Aka %s\n", aka2str(fgroup.UseAka)); + fprintf(fp, " Uplink %s\n", aka2str(fgroup.UpLink)); + fprintf(fp, " Areas file %s\n", fgroup.AreaFile); + fprintf(fp, " Divice cost %s\n", getboolean(fgroup.DivideCost)); + fprintf(fp, " Unit cost %ld\n", fgroup.UnitCost); + fprintf(fp, " Unit size %ld\n", fgroup.UnitSize); + fprintf(fp, " Add promille %ld\n", fgroup.AddProm); + fprintf(fp, " Start area %ld\n", fgroup.StartArea); + fprintf(fp, " Banner file %s\n", fgroup.Banner); + fprintf(fp, " Def. archiver %s\n", fgroup.Convert); + fprintf(fp, " Filegate fmt %s\n", getboolean(fgroup.FileGate)); + fprintf(fp, " Auto change %s\n", getboolean(fgroup.AutoChange)); + fprintf(fp, " User change %s\n", getboolean(fgroup.UserChange)); + fprintf(fp, " Allow replace %s\n", getboolean(fgroup.Replace)); + fprintf(fp, " Dupe checking %s\n", getboolean(fgroup.DupCheck)); + fprintf(fp, " Secure %s\n", getboolean(fgroup.Secure)); + fprintf(fp, " No touch dates %s\n", getboolean(fgroup.NoTouch)); + fprintf(fp, " Virus scan %s\n", getboolean(fgroup.VirScan)); + fprintf(fp, " Announce %s\n", getboolean(fgroup.Announce)); + fprintf(fp, " Update magics %s\n", getboolean(fgroup.UpdMagic)); + fprintf(fp, " FILE_ID.DIZ %s\n", getboolean(fgroup.FileId)); + fprintf(fp, " Convert all %s\n", getboolean(fgroup.ConvertAll)); + fprintf(fp, " Send original %s\n", getboolean(fgroup.SendOrg)); + fprintf(fp, " Base path %s\n", fgroup.BasePath); + fprintf(fp, " Download sec. %s\n", get_secstr(fgroup.DLSec)); + fprintf(fp, " Upload sec. %s\n", get_secstr(fgroup.UPSec)); + fprintf(fp, " List security %s\n", get_secstr(fgroup.LTSec)); + fprintf(fp, " BBS group %s\n", fgroup.BbsGroup); + fprintf(fp, " Announce group %s\n", fgroup.AnnGroup); + fprintf(fp, " Upload area %d\n", fgroup.Upload); + fprintf(fp, " Start date %s", ctime(&fgroup.StartDate)); + fprintf(fp, " Last date %s\n", ctime(&fgroup.LastDate)); } fclose(no); diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index 387f4053..7164fbed 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -1458,61 +1458,31 @@ void e_html(void) mvprintw( 8, 2, "2. Link to ftp"); mvprintw( 9, 2, "3. URL name"); mvprintw(10, 2, "4. Charset"); - mvprintw(11, 2, "5. Table color"); - mvprintw(12, 2, "6. Hdr. color"); - mvprintw(13, 2, "7. Author name"); - mvprintw(14, 2, "8. Convert cmd"); - mvprintw(15, 2, "9. Files/page"); - mvprintw(16, 1,"10. Icon Home"); - mvprintw(17, 1,"11. Text Home"); - mvprintw(18, 1,"12. Icon Back"); - mvprintw(19, 1,"13. Text Back"); - mvprintw(16,41,"14. Icon Prev."); - mvprintw(17,41,"15. Text Prev."); - mvprintw(18,41,"16. Icon Next"); - mvprintw(19,41,"17. Text Next"); + mvprintw(11, 2, "5. Author name"); + mvprintw(12, 2, "6. Convert cmd"); + mvprintw(13, 2, "7. Files/page"); set_color(WHITE, BLACK); show_str( 7,18,59, CFG.www_root); show_str( 8,18,20, CFG.www_link2ftp); show_str( 9,18,40, CFG.www_url); show_str(10,18,20, CFG.www_charset); - show_str(11,18,20, CFG.www_tbgcolor); - show_str(12,18,20, CFG.www_hbgcolor); - show_str(13,18,40, CFG.www_author); - show_str(14,18,59, CFG.www_convert); - show_int(15,18, CFG.www_files_page); - show_str(16,18,20, CFG.www_icon_home); - show_str(17,18,20, CFG.www_name_home); - show_str(18,18,20, CFG.www_icon_back); - show_str(19,18,20, CFG.www_name_back); - show_str(16,58,20, CFG.www_icon_prev); - show_str(17,58,20, CFG.www_name_prev); - show_str(18,58,20, CFG.www_icon_next); - show_str(19,58,20, CFG.www_name_next); + show_str(11,18,40, CFG.www_author); + show_str(12,18,59, CFG.www_convert); + show_int(13,18, CFG.www_files_page); for (;;) { set_color(WHITE, BLACK); - switch(select_menu(17)) { + switch(select_menu(7)) { case 0: return; case 1: E_STR( 7,18,59, CFG.www_root, "The ^Document root^ of your http server") case 2: E_STR( 8,18,20, CFG.www_link2ftp, "The ^link^ name from the Document root to the FTP base directory") case 3: E_STR( 9,18,40, CFG.www_url, "The ^URL^ name of your http server") case 4: E_STR(10,18,20, CFG.www_charset, "The ^ISO character set^ name to include in the web pages") - case 5: E_STR(11,18,20, CFG.www_tbgcolor, "The ^Tables background color^ to use") - case 6: E_STR(12,18,20, CFG.www_hbgcolor, "The ^Table headers background color^ to use") - case 7: E_STR(13,18,40, CFG.www_author, "The ^Author name^ to include in the http headers") - case 8: E_STR(14,18,59, CFG.www_convert, "The ^convert^ command to create thumbnails") - case 9: E_INT(15,18, CFG.www_files_page, "The number of files on each web page") - case 10:E_STR(16,18,20, CFG.www_icon_home, "The ^Home icon^ filename") - case 11:E_STR(17,18,20, CFG.www_name_home, "The ^Home text^ to appear") - case 12:E_STR(18,18,20, CFG.www_icon_back, "The ^Back icon^ filename") - case 13:E_STR(19,18,20, CFG.www_name_back, "The ^Back text^ to appear") - case 14:E_STR(16,58,20, CFG.www_icon_prev, "The ^Previous page icon^ filename") - case 15:E_STR(17,58,20, CFG.www_name_prev, "The ^Previous page text^ to appear") - case 16:E_STR(18,58,20, CFG.www_icon_next, "The ^Next Page icon^ filename") - case 17:E_STR(19,58,20, CFG.www_name_next, "The ^Next Page text^ to appear") + case 5: E_STR(11,18,40, CFG.www_author, "The ^Author name^ to include in the http headers") + case 6: E_STR(12,18,59, CFG.www_convert, "The ^convert^ command to create thumbnails") + case 7: E_INT(13,18, CFG.www_files_page, "The number of files on each web page") } }; } @@ -2045,18 +2015,8 @@ int global_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Link to FTP base %s\n", CFG.www_link2ftp); fprintf(fp, " Webserver URL %s\n", CFG.www_url); fprintf(fp, " Character set %s\n", CFG.www_charset); - fprintf(fp, " Table bgcolor %s\n", CFG.www_tbgcolor); - fprintf(fp, " Header bgcolor %s\n", CFG.www_hbgcolor); fprintf(fp, " Author name %s\n", CFG.www_author); fprintf(fp, " Convert command %s\n", CFG.www_convert); - fprintf(fp, " Icon Home %s\n", CFG.www_icon_home); - fprintf(fp, " String for Home %s\n", CFG.www_name_home); - fprintf(fp, " Icon Back %s\n", CFG.www_icon_back); - fprintf(fp, " String for Back %s\n", CFG.www_name_back); - fprintf(fp, " Icon Previous %s\n", CFG.www_icon_home); - fprintf(fp, " String for Prev. %s\n", CFG.www_name_home); - fprintf(fp, " Icon Next %s\n", CFG.www_icon_back); - fprintf(fp, " String for Next %s\n", CFG.www_name_back); fprintf(fp, " File per webpage %d\n", CFG.www_files_page); return page; diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c index 30176f40..63c11830 100644 --- a/mbtask/mbtask.c +++ b/mbtask/mbtask.c @@ -378,18 +378,8 @@ void load_maincfg(void) sprintf(CFG.www_link2ftp, "files"); sprintf(CFG.www_url, "http://%s", CFG.sysdomain); sprintf(CFG.www_charset, "ISO 8859-1"); - sprintf(CFG.www_tbgcolor, "Silver"); - sprintf(CFG.www_hbgcolor, "Aqua"); sprintf(CFG.www_author, "Your Name"); sprintf(CFG.www_convert,"/usr/X11R6/bin/convert -geometry x100"); - sprintf(CFG.www_icon_home, "up.gif"); - sprintf(CFG.www_name_home, "Home"); - sprintf(CFG.www_icon_back, "back.gif"); - sprintf(CFG.www_name_back, "Back"); - sprintf(CFG.www_icon_prev, "left.gif"); - sprintf(CFG.www_name_prev, "Previous page"); - sprintf(CFG.www_icon_next, "right.gif"); - sprintf(CFG.www_name_next, "Next page"); CFG.www_files_page = 10; CFG.maxarticles = 500;