diff --git a/ChangeLog b/ChangeLog
index d5920725..042c0f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ v0.71.2 16-Jan-2005
Removed obsolete bbslist editor.
Added chatserver setup, only visible when compiled with the
--enable-experint configuration.
+ Made some web sitedoc screens look better.
html:
Added batch file upload written by Russell Tiedt to the faq.
diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c
index 21c38b3a..b7c8c650 100644
--- a/mbsetup/m_archive.c
+++ b/mbsetup/m_archive.c
@@ -794,8 +794,7 @@ int archive_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"archivers.html", (char *)"Archivers", NULL);
fprintf(ip, "Main\n
\n");
- fprintf(ip, "
\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
fprintf(ip, "\n");
fprintf(ip, "Name | Comment | Available |
\n");
diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c
index e8673ba2..5253efbb 100644
--- a/mbsetup/m_farea.c
+++ b/mbsetup/m_farea.c
@@ -767,7 +767,10 @@ int bbs_file_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"fileareas.html", (char *)"File Areas", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Area | Comment |
\n");
while ((fread(&area, areahdr.recsize, 1, no)) == 1) {
@@ -783,7 +786,7 @@ int bbs_file_doc(FILE *fp, FILE *toc, int page)
sprintf(temp, "filearea_%d.html", i);
- fprintf(ip, " - %3d %s
\n", temp, i, area.Name);
+ fprintf(ip, " %d | %s |
\n", temp, i, area.Name);
if ((wp = open_webdoc(temp, (char *)"File area", area.Name))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -880,7 +883,8 @@ int bbs_file_doc(FILE *fp, FILE *toc, int page)
}
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c
index c0be3c22..41163023 100644
--- a/mbsetup/m_fgroup.c
+++ b/mbsetup/m_fgroup.c
@@ -699,7 +699,10 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"filegroup.html", (char *)"File Groups", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Group | Comment | Active |
\n");
while ((fread(&fgroup, fgrouphdr.recsize, 1, no)) == 1) {
if (First) {
@@ -712,7 +715,8 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
}
sprintf(temp, "filegroup_%s.html", fgroup.Name);
- fprintf(ip, " - %s %s
\n", temp, fgroup.Name, fgroup.Comment);
+ fprintf(ip, " %s | %s | %s |
\n",
+ temp, fgroup.Name, fgroup.Comment, getboolean(fgroup.Active));
if ((wp = open_webdoc(temp, (char *)"File group", fgroup.Comment))) {
fprintf(wp, "Main Back\n");
@@ -887,7 +891,8 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Last date %s\n", ctime(&fgroup.LastDate));
}
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_fido.c b/mbsetup/m_fido.c
index a2990e07..29393816 100644
--- a/mbsetup/m_fido.c
+++ b/mbsetup/m_fido.c
@@ -546,8 +546,7 @@ int fido_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"fidonet.html", (char *)"Fidonet networks", NULL);
fprintf(ip, "Main\n\n");
- fprintf(ip, "
\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
fprintf(ip, "\n");
fprintf(ip, "Zone | Comment | Available |
\n");
diff --git a/mbsetup/m_hatch.c b/mbsetup/m_hatch.c
index 3ae8daea..b311e48b 100644
--- a/mbsetup/m_hatch.c
+++ b/mbsetup/m_hatch.c
@@ -574,7 +574,10 @@ int tic_hatch_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"hatch.html", (char *)"File Areas", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Nr | Pattern | Active |
\n");
while ((fread(&hatch, hatchhdr.recsize, 1, no)) == 1) {
@@ -586,7 +589,8 @@ int tic_hatch_doc(FILE *fp, FILE *toc, int page)
}
sprintf(temp, "hatch_%d.html", nr);
- fprintf(ip, " - Hatch %3d %s
\n", temp, nr, hatch.Spec);
+ fprintf(ip, " %d | %s | %s |
\n",
+ temp, nr, hatch.Spec, getboolean(hatch.Active));
if ((wp = open_webdoc(temp, (char *)"Hatch Manager", hatch.Spec))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -667,7 +671,8 @@ int tic_hatch_doc(FILE *fp, FILE *toc, int page)
j++;
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_magic.c b/mbsetup/m_magic.c
index 2fb91912..203a7f7e 100644
--- a/mbsetup/m_magic.c
+++ b/mbsetup/m_magic.c
@@ -503,7 +503,10 @@ int tic_magic_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"magic.html", (char *)"File Magic Processing", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Nr | Mask | Type | Active |
\n");
while (fread(&magic, magichdr.recsize, 1, no) == 1) {
if (j == 6) {
@@ -514,7 +517,8 @@ int tic_magic_doc(FILE *fp, FILE *toc, int page)
nr++;
sprintf(temp, "magic_%d.html", nr);
- fprintf(ip, " - Magic %3d %s
\n", temp, nr, magic.Mask);
+ fprintf(ip, " %d | %s | %s | %s |
\n",
+ temp, nr, magic.Mask, getmagictype(magic.Attrib), getboolean(magic.Active));
if ((wp = open_webdoc(temp, (char *)"File Magic", magic.Mask))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -561,7 +565,8 @@ int tic_magic_doc(FILE *fp, FILE *toc, int page)
j++;
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c
index c1ff5b5b..4b9e371e 100644
--- a/mbsetup/m_marea.c
+++ b/mbsetup/m_marea.c
@@ -1867,7 +1867,10 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"msgareas.html", (char *)"Message Areas", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Area | Comment | Tag |
\n");
while (fread(&msgs, msgshdr.recsize, 1, no) == 1) {
@@ -1883,7 +1886,8 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, "\n\n");
sprintf(temp, "msgarea_%d.html", i);
- fprintf(ip, " - Area %d %s
\n", temp, i, msgs.Name);
+ fprintf(ip, " %d | %s | %s | \n",
+ temp, i, msgs.Name, strlen(msgs.Tag) ? msgs.Tag : " ");
if ((wp = open_webdoc(temp, (char *)"File area", msgs.Name))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -2033,7 +2037,8 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
fseek(no, msgshdr.syssize, SEEK_CUR);
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c
index 1ab57535..292e93f8 100644
--- a/mbsetup/m_mgroup.c
+++ b/mbsetup/m_mgroup.c
@@ -657,8 +657,11 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"msggroup.html", (char *)"Message Groups", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
-
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Group | Comment | Active |
\n");
+
while ((fread(&mgroup, mgrouphdr.recsize, 1, no)) == 1) {
if (j == 2) {
page = newpage(fp, page);
@@ -667,7 +670,8 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
}
sprintf(temp, "msggroup_%s.html", mgroup.Name);
- fprintf(ip, " - %s %s
\n", temp, mgroup.Name, mgroup.Comment);
+ fprintf(ip, " %s | %s | %s |
\n",
+ temp, mgroup.Name, mgroup.Comment, getboolean(mgroup.Active));
if ((wp = open_webdoc(temp, (char *)"Message group", mgroup.Comment))) {
fprintf(wp, "Main Back\n");
@@ -763,7 +767,7 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
}
fprintf(wp, "
\n");
fprintf(wp, "Group Statistics
\n");
- add_statcnt(wp, (char *)"reveived messages", mgroup.MsgsRcvd);
+ add_statcnt(wp, (char *)"received messages", mgroup.MsgsRcvd);
add_statcnt(wp, (char *)"sent messages", mgroup.MsgsSent);
close_webdoc(wp);
}
@@ -792,7 +796,8 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
j++;
}
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_modem.c b/mbsetup/m_modem.c
index 47fb10de..4a8574b7 100644
--- a/mbsetup/m_modem.c
+++ b/mbsetup/m_modem.c
@@ -701,8 +701,7 @@ int modem_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"modem.html", (char *)"Modems", NULL);
fprintf(ip, "Main\n");
fprintf(ip, "\n");
- fprintf(ip, "
\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
fprintf(ip, "\n");
fprintf(ip, "Nr | Comment | Available |
\n");
diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c
index e85d5643..300e794a 100644
--- a/mbsetup/m_node.c
+++ b/mbsetup/m_node.c
@@ -1443,8 +1443,11 @@ int node_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"nodes.html", (char *)"Fidonet Nodes", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
-
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Node | Sysop | Flags |
\n");
+
while ((fread(&nodes, nodeshdr.recsize, 1, no)) == 1) {
page = newpage(fp, page);
@@ -1458,7 +1461,9 @@ int node_doc(FILE *fp, FILE *toc, int page)
sprintf(temp, "node_%d_%d_%d_%d_%s.html", nodes.Aka[0].zone, nodes.Aka[0].net, nodes.Aka[0].node,
nodes.Aka[0].point, nodes.Aka[0].domain);
- fprintf(ip, " - %s %s
\n", temp, aka2str(nodes.Aka[0]), nodes.Sysop);
+ fprintf(ip, " %s | %s | %s |
\n",
+ temp, aka2str(nodes.Aka[0]), nodes.Sysop, nodes.Crash ? "Crash": nodes.Hold ? "Hold":"Normal");
+
if ((wp = open_webdoc(temp, (char *)"Fidonet node", aka2str(nodes.Aka[0])))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -1790,7 +1795,8 @@ int node_doc(FILE *fp, FILE *toc, int page)
}
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_protocol.c b/mbsetup/m_protocol.c
index 47ca7c4a..547ad078 100644
--- a/mbsetup/m_protocol.c
+++ b/mbsetup/m_protocol.c
@@ -695,8 +695,11 @@ int bbs_prot_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"protocol.html", (char *)"BBS Transfer Protocols", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
-
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Zone | Comment | Available | Type |
\n");
+
while ((fread(&PROT, PROThdr.recsize, 1, no)) == 1) {
if (j == 4) {
@@ -706,7 +709,8 @@ int bbs_prot_doc(FILE *fp, FILE *toc, int page)
}
sprintf(temp, "protocol_%s.html", PROT.ProtKey);
- fprintf(ip, "- %s
\n", temp, PROT.ProtName);
+ fprintf(ip, "%s | %s | %s | %s |
\n",
+ temp, PROT.ProtKey, PROT.ProtName, getboolean(PROT.Available), PROT.Internal ? "Internal":"External");
if ((wp = open_webdoc(temp, (char *)"BBS Transfer Protocol", PROT.ProtName))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -746,7 +750,8 @@ int bbs_prot_doc(FILE *fp, FILE *toc, int page)
j++;
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_ticarea.c b/mbsetup/m_ticarea.c
index 41bba603..90bc8e14 100644
--- a/mbsetup/m_ticarea.c
+++ b/mbsetup/m_ticarea.c
@@ -1273,8 +1273,11 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"ticareas.html", (char *)"TIC Areas", NULL);
fprintf(ip, "Main\n");
- fprintf(ip, "\n");
-
+ fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "\n");
+ fprintf(ip, "Area | Comment | Active |
\n");
+
while ((fread(&tic, tichdr.recsize, 1, no)) == 1) {
page = newpage(fp, page);
@@ -1287,7 +1290,8 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, "\n\n");
sprintf(temp, "ticarea_%s.html", tic.Name);
- fprintf(ip, " - Area %s %s
\n", temp, tic.Name, tic.Comment);
+ fprintf(ip, " %s | %s | %s |
\n",
+ temp, tic.Name, tic.Comment, getboolean(tic.Active));
if ((wp = open_webdoc(temp, (char *)"TIC Area", tic.Comment))) {
fprintf(wp, "Main Back\n");
fprintf(wp, "\n");
@@ -1476,7 +1480,8 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page)
}
}
- fprintf(ip, "\n");
+ fprintf(ip, "
\n");
+ fprintf(ip, "
\n");
close_webdoc(ip);
fclose(no);
diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c
index 4fbe44ae..b7470523 100644
--- a/mbsetup/m_tty.c
+++ b/mbsetup/m_tty.c
@@ -591,8 +591,7 @@ int tty_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"ttyinfo.html", (char *)"TTY Lines", NULL);
fprintf(ip, "Main\n");
fprintf(ip, "\n");
- fprintf(ip, "
\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
fprintf(ip, "\n");
fprintf(ip, "TTY | Comment | Available |
\n");
diff --git a/mbsetup/m_virus.c b/mbsetup/m_virus.c
index bdda4437..99876e1a 100644
--- a/mbsetup/m_virus.c
+++ b/mbsetup/m_virus.c
@@ -442,8 +442,7 @@ int virus_doc(FILE *fp, FILE *toc, int page)
ip = open_webdoc((char *)"virscan.html", (char *)"Virus Scanners", NULL);
fprintf(ip, "Main\n");
fprintf(ip, "\n");
- fprintf(ip, "
\n");
- fprintf(ip, "\n");
+ fprintf(ip, "\n");
fprintf(ip, "\n");
fprintf(ip, "Nr | Comment | Available |
\n");