From 376e2b2b5c66b146cf107483fd7be6f7c28804e4 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 27 Apr 2002 12:29:08 +0000
Subject: [PATCH] mbfido web cleanup, small extensions, html macro files fixes

---
 examples/templates.tar | Bin 81920 -> 81920 bytes
 mbfido/makestat.c      |  19 +++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/examples/templates.tar b/examples/templates.tar
index c366824f1a18656feb02bbce42af81e29b9b1fac..5abd020e72fac99225605aab2be0fd4f4c366884 100644
GIT binary patch
delta 1313
zcmZuxPe>F|9QN(HF8;aHTI_1YvwxZ)&EK5@6R{2+EUC3a7j2w<t7E$}vhynTQie*0
zt%!Zl+{!3|4v{#9Q5_0O3XHNK1PP@e3PI`=5mfJuyVELNhMDhszwiCt`@Y`{4F!gV
z0^=9Cb%M+(yug)kyevhf5-41WJAluERfNKb9Hfl6ijhQFDKK(2QdA?!yii~|vtkh=
z=b1EB8(yQP$gGAjqpO&x$a9Q|QszRovPeymMVDbUWF!(6loC#nqJqpzVpO1~;uW@l
zBRrrh?(Pec+rPT)?d!pYU<HJ*xm_TG_iHMliec+v*u1A*aAqg#1G$HzVIk^C@d|xs
zQlcmINdAx1^{2JPQe<{=%svqU<>b!OYVu^M-o6<Eh6A6?`ExHuA`<8AAX0I*12x0j
z;boQIpEP?(-RHfeXRM5L%!I1ibqky63{2_<BI{-%<n>sP9G}^JE|#&(L1?HcRIv@h
z1l$ihOijhQX|V4;`hCnoafopS4w`Aqz<vsL=_v#?(=d>RQJkSVMGve1v>3)ur9G7a
zO2v?YVQ&T_i!DA$k)udMdednt?!ifSp=B`v&9pFVP?KlWj0L$}tSaUBUrqSPmk-%M
z5+!gwx$$7dlDfPlEr(P+iPEq?f7*ZM&>Q8Q<u{GMhcmWX4R(~RG*6B!Y$v^MUpFME
zhg}C-m=J8HFRguRfqvKoTXj-5y$KAkCpo*k8Ki7(BWQ3I-rWKd??<b`0`GY*D5C2O
z%X2<PpYVUYU;G+b<2_H7-=v(IOP!^;Z=+#Z@+2jR%JaM^MLo&y<Nl@tu}-LJSU>H0
z$n0T=mPT>iHO#e!B5~A<uybTy_YvjCxEJVch1)x9#*qarOpUX!u31IlruTQv3H=QD
z95}rQ$oQ6zx!=PzGDkbfkBz9XRI;qona`j1&zwK(Ws7yup;A*dHAzi!I_3?Z-4+0k
zy+*bc8fj~bLET80>6DuxXeJ6nM*C=-dRzvc`vR`8eZCw-?0Z45v$jYZ##M}{pY1KK
zmAZYg9AM|f;AL>N0?+}K3r$P(AI6&I_`;1&fl9yy*W{}(@^()MteSZiD`wVIcL-c6
Jy&VQS{{nCwhC~1W

delta 1007
zcmZ9LQAiX)7{{Hn>r5{(RJc2^rlN>?aAtRBm&oiMl<Xlbke-4#Z`a(^ySm*3AEE<2
ze7FMLf$q7e-h|UlPSPOqr9cTYB8a3Af(o=AB1Eue_HNHR*|+)4|3BaN|GrHoy~(6E
zdk-DJG9n^TDi9`;B3D3RT(tpCgHk{c2Nq;REF+SrV3&||utXyfL2^k~S}Y-?KoZPt
zq})wH3fFLwDkHKe2%N}_jHPQz+$177glp(%Fo0PniX;n279=9GuCOAq5)s9K-IzS>
zqy4K5bmm!*j;}V-xvfZMelIv^EezSiGh=%uV3qYe6~Ii$OfdV9j2#n!6iwzx-el@k
zsLbTif|u)Gj|K(IL<Iu@IR;L)g(}|oD=EyLqn(TOlrA2-+Zk6iI1rCUOg$c}J_=zk
zJPVyeQy<h|G#-m-QBzYny6&RFDN{i8cA_ZlbGf0#OxQDQY6h3-?r}nkYWk3-?w}jC
zx-{*f8=uE(FGlnMEdl#<!;B|}%bK$me0KlxN#M~3>8;Jf-u8jWO@r309HHOdy#*S5
zvT}%`ty=1zZKvz&XY8x*9|IZ&ccwq2`~f7oL%|XzJWqml@?10Xd4ByKs_GD0TbkQ0
zT%iwVdkd3caCy+4`q{;%Q)~T71=wP_;mR0sH&GIc)A^mPY;v-TCNxzydGp0gRINud
z?aQBZ4?X`k%QvBpUp1g%vH%TJj~ct0HtkcJ^&ZyM30kx9Cl{^;FMzc@5|U)OScM`9
zP8EvC{*uCo|9z}<-pO3^f_eT>=8_KtsI^+pcP__vZp~BE(%jwA+S1+D8t%(%?*rxo
zKS%`-^UAM|Lh`<>!GdoN><7q4zx=4mOg4a~U9~zv<%~vfpC#4!Gz5<GdS8MG82%5t
CPeaB4

diff --git a/mbfido/makestat.c b/mbfido/makestat.c
index ed3f7328..8776e75f 100644
--- a/mbfido/makestat.c
+++ b/mbfido/makestat.c
@@ -209,8 +209,9 @@ void MakeStat(void)
 		while ((fread(&fgroup, fgrouphdr.recsize, 1, fg)) == 1) {
 		    if (fgroup.Active) {
 			fseek(fi, fileptr, SEEK_SET);
-			MacroVars("bcdefghi", "ssssdddd", fgroup.Name, fgroup.Comment, aka2str(fgroup.UseAka), adate(fgroup.LastDate),
-				fgroup.Files.lweek, fgroup.KBytes.lweek, fgroup.Files.month[Lm], fgroup.KBytes.month[Lm]);
+			MacroVars("bcdefghi", "ssssdddd", fgroup.Name, fgroup.Comment, aka2str(fgroup.UseAka), 
+				adate(fgroup.LastDate), fgroup.Files.lweek, fgroup.KBytes.lweek, 
+				fgroup.Files.month[Lm], fgroup.KBytes.month[Lm]);
 			MacroRead(fi, fw);
 		    }
 		}
@@ -273,8 +274,8 @@ void MakeStat(void)
 			q = xstrcpy((char *)"Hold");
 		    else
 			q = xstrcpy((char *)"Normal");
-		    MacroVars("bcdefgh", "sssssdd", aka2str(nodes.Aka[0]), nodes.Sysop, q, p, 
-			    adate(nodes.LastDate), nodes.Credit, nodes.Debet);
+		    MacroVars("bcdefghi", "sssssddd", aka2str(nodes.Aka[0]), nodes.Sysop, q, p, 
+			    adate(nodes.LastDate), nodes.Billing, nodes.Credit, nodes.Debet);
 		    MacroRead(fi, fw);
 		    free(p);
 		    free(q);
@@ -309,14 +310,15 @@ void MakeStat(void)
 		    fseek(fi, fileptr, SEEK_SET);
 		    if (!strcmp(hist.aka.domain, "(null)"))
 			hist.aka.domain[0] = '\0';
-		    MacroVars("cdefghij", "sssssdds", hist.aka.zone?aka2str(hist.aka):"N/A", hist.system_name, hist.location,
-					adate(hist.online), t_elapsed(hist.online, hist.offline), hist.sent_bytes,
-					hist.rcvd_bytes, hist.inbound ? "In":"Out");
+		    MacroVars("cdefghijklm", "sssssssddds", hist.aka.zone?aka2str(hist.aka):"N/A", hist.system_name, 
+					hist.sysop, hist.location, hist.tty, adate(hist.online), 
+					t_elapsed(hist.online, hist.offline), hist.sent_bytes,
+					hist.rcvd_bytes, hist.cost, hist.inbound ? "In":"Out");
 		    MacroRead(fi, fw);
 		}
 		closepage(fw, (char *)"mailhistory", fi);
 	    } else {
-		WriteError("Can't create tic.html");
+		WriteError("Can't create mailhistory.html");
 	    }
 	    fclose(fi);
 	    MacroClear();
@@ -332,6 +334,7 @@ void MakeStat(void)
 	    fread(&SYSINFO, sizeof(SYSINFO), 1, fg);
 	    MacroVars("bcdefgh", "dddddss", SYSINFO.SystemCalls, SYSINFO.Pots, SYSINFO.ISDN, SYSINFO.Network,
 		    SYSINFO.Local, adate(SYSINFO.StartDate), SYSINFO.LastCaller);
+	    MacroVars("i", "s", adate(SYSINFO.LastTime));
 	    if ((fw = newpage((char *)"sysinfo", fi)) != NULL) {
 		closepage(fw, (char *)"sysinfo", fi);
 	    } else {