bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Templates now have global macro's

Browse Source
This commit is contained in:
Michiel Broek 2002-03-31 15:04:34 +00:00
parent deff3bc1d6
commit a93361a7ba
5 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/Makefile
View File

@ -29,6 +29,14 @@ install:
tar xfC txtfiles.tar ${PREFIX}/english/txtfiles ; \ tar xfC txtfiles.tar ${PREFIX}/english/txtfiles ; \
echo "Installing default english txtfiles" ; \ echo "Installing default english txtfiles" ; \
fi fi
@echo -e "\a"
@echo "WARNING: overwriting all your templates! Do not customize them yet,"
@echo "there will be a lot of changes coming. If you still do so, it is not our fault"
@echo "Also do not make any translations yet! Wait until we are ready with this"
@echo "End of WARNING WARNING WARNING."
@echo -e "\a"
@echo -n "Press ENTER to continue: "
@read junk
tar xfC templates.tar ${PREFIX}/english/macro tar xfC templates.tar ${PREFIX}/english/macro
clean: clean:

6
lib/mbdiesel.c
View File

@ -32,6 +32,7 @@
#include "structs.h" #include "structs.h"
#include "users.h" #include "users.h"
#include "records.h" #include "records.h"
#include "common.h"
#include "clcomm.h" #include "clcomm.h"
#include "diesel.h" #include "diesel.h"
@ -230,8 +231,11 @@ FILE *OpenMacro(const char *filename, int Language)
if (fi == NULL) if (fi == NULL)
Syslog('d', "OpenMacro(%s, %c): not found, using hardcoded", filename, Language); Syslog('d', "OpenMacro(%s, %c): not found, using hardcoded", filename, Language);
else else {
Syslog('d', "OpenMacro(%s, %c): using %s", filename, Language, temp); Syslog('d', "OpenMacro(%s, %c): using %s", filename, Language, temp);
MacroVars("HLMNSTUYZ", "ssssssssd", CFG.www_url, CFG.location, CFG.sysdomain, CFG.bbs_name,
CFG.sysop_name, CFG.comment, CFG.sysop, aka2str(CFG.aka[0]), 0);
}
free(temp); free(temp);
return fi; return fi;

2
mbfido/announce.c
View File

@ -302,7 +302,7 @@ long Report(gr_list *ta, long filepos)
} }
if ((fi = OpenMacro(newfiles.Template, newfiles.Language)) != NULL) { if ((fi = OpenMacro(newfiles.Template, newfiles.Language)) != NULL) {
MacroVars("GHZ", "ssd", T_File.Echo, T_File.Comment, 0); MacroVars("GJZ", "ssd", T_File.Echo, T_File.Comment, 0);
fseek(fi, filepos, SEEK_SET); fseek(fi, filepos, SEEK_SET);
Msg_Macro(fi); Msg_Macro(fi);
filepos1 = ftell(fi); filepos1 = ftell(fi);

59
mbfido/areamgr.c
View File

@ -89,11 +89,11 @@ void A_Help(faddr *t, char *replyid)
subject = calloc(255, sizeof(char)); subject = calloc(255, sizeof(char));
sprintf(subject,"AreaMgr Help"); sprintf(subject,"AreaMgr Help");
MacroVars("SsNAP", "sssss", CFG.sysop_name, nodes.Sysop, "Areamgr", ascfnode(bestaka_s(t), 0xf), nodes.Apasswd );
GetRpSubject("areamgr.help",subject); GetRpSubject("areamgr.help",subject);
if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject , replyid)) != NULL) { if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject , replyid)) != NULL) {
if ((fi = OpenMacro("areamgr.help", nodes.Language)) != NULL ){ if ((fi = OpenMacro("areamgr.help", nodes.Language)) != NULL ){
MacroVars("sAYP", "ssss", nodes.Sysop, "Areamgr", ascfnode(bestaka_s(t), 0xf), nodes.Apasswd );
MacroRead(fi, fp); MacroRead(fi, fp);
MacroClear(); MacroClear();
fclose(fi); fclose(fi);
@ -154,7 +154,7 @@ void A_Query(faddr *t, char *replyid)
void A_List(faddr *t, char *replyid, int Notify) void A_List(faddr *t, char *replyid, int Notify)
{ {
FILE *qp, *gp, *mp, *fi; FILE *qp, *gp, *mp, *fi = NULL;
char *temp, *Group, *subject; char *temp, *Group, *subject;
int i, First = TRUE, SubTot, Total = 0, Cons; int i, First = TRUE, SubTot, Total = 0, Cons;
char Stat[5]; char Stat[5];
@ -164,14 +164,8 @@ void A_List(faddr *t, char *replyid, int Notify)
fpos_t fileptr,fileptr1,fileptr2; fpos_t fileptr,fileptr1,fileptr2;
subject = calloc(255, sizeof(char)); subject = calloc(255, sizeof(char));
f = bestaka_s(t);
MacroVars("SsKyY", "ssdss", MacroVars("sKyY", "sdss", nodes.Sysop, Notify, ascfnode(t, 0xff), ascfnode(f, 0xf));
CFG.sysop_name,
nodes.Sysop,
Notify,
ascfnode(t, 0xff),
ascfnode(bestaka_s(t), 0xf)
);
if (Notify==LIST_NOTIFY){ if (Notify==LIST_NOTIFY){
Syslog('+', "AreaMgr: Notify to %s", ascfnode(t, 0xff)); Syslog('+', "AreaMgr: Notify to %s", ascfnode(t, 0xff));
@ -193,7 +187,6 @@ void A_List(faddr *t, char *replyid, int Notify)
sprintf(subject,"AreaMgr: Unlinked areas"); sprintf(subject,"AreaMgr: Unlinked areas");
GetRpSubject("areamgr.unlink",subject); GetRpSubject("areamgr.unlink",subject);
} }
f = bestaka_s(t);
if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid)) != NULL) { if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid)) != NULL) {
@ -203,7 +196,6 @@ void A_List(faddr *t, char *replyid, int Notify)
*/ */
msgptr = ftell(qp); msgptr = ftell(qp);
fi=NULL;
if (Notify==LIST_LIST){ if (Notify==LIST_LIST){
fi=OpenMacro("areamgr.list", nodes.Language); fi=OpenMacro("areamgr.list", nodes.Language);
WriteMailGroups(qp, f); WriteMailGroups(qp, f);
@ -260,7 +252,7 @@ void A_List(faddr *t, char *replyid, int Notify)
(g->node == f->node) && (g->point == f->point)) { (g->node == f->node) && (g->point == f->point)) {
SubTot = 0; SubTot = 0;
if (fi != NULL){ if (fi != NULL){
MacroVars("GHI", "sss",mgroup.Name, mgroup.Comment, aka2str(mgroup.UseAka) ); MacroVars("GJI", "sss",mgroup.Name, mgroup.Comment, aka2str(mgroup.UseAka) );
fsetpos(fi,&fileptr); fsetpos(fi,&fileptr);
MacroRead(fi, qp); MacroRead(fi, qp);
fgetpos(fi,&fileptr1); fgetpos(fi,&fileptr1);
@ -298,7 +290,7 @@ void A_List(faddr *t, char *replyid, int Notify)
|| ((Notify == LIST_QUERY) && ((Stat[0]=='S') || (Stat[1]=='R'))) || ((Notify == LIST_QUERY) && ((Stat[0]=='S') || (Stat[1]=='R')))
|| ((Notify >= LIST_UNLINK) && ((Stat[0]!='S') && (Stat[1]!='R')))){ || ((Notify >= LIST_UNLINK) && ((Stat[0]!='S') && (Stat[1]!='R')))){
if (fi !=NULL){ if (fi !=NULL){
MacroVars("XTNsrpc", "sssdddd", MacroVars("XDEsrpc", "sssdddd",
Stat, msgs.Tag, msgs.Name, Stat, msgs.Tag, msgs.Name,
(Stat[0] == 'S'), (Stat[0] == 'S'),
(Stat[1] == 'R'), (Stat[1] == 'R'),
@ -318,7 +310,7 @@ void A_List(faddr *t, char *replyid, int Notify)
fseek(mp, msgshdr.syssize, SEEK_CUR); fseek(mp, msgshdr.syssize, SEEK_CUR);
} }
if (fi != NULL){ if (fi != NULL){
MacroVars("ZA", "dd", (int) 0 , SubTot ); MacroVars("ZC", "dd", (int) 0 , SubTot );
fsetpos(fi,&fileptr2); fsetpos(fi,&fileptr2);
if (((ftell(qp) - msgptr) / 1024) >= CFG.new_split) { if (((ftell(qp) - msgptr) / 1024) >= CFG.new_split) {
MacroVars("Z","d",1); MacroVars("Z","d",1);
@ -372,7 +364,7 @@ void A_List(faddr *t, char *replyid, int Notify)
void A_Flow(faddr *t, char *replyid, int Notify) void A_Flow(faddr *t, char *replyid, int Notify)
{ {
FILE *qp, *gp, *mp, *fi; FILE *qp, *gp, *mp, *fi = NULL;
char *temp, *Group, *subject; char *temp, *Group, *subject;
int i, First = TRUE, Cons; int i, First = TRUE, Cons;
char Stat[2]; char Stat[2];
@ -394,14 +386,8 @@ void A_Flow(faddr *t, char *replyid, int Notify)
lmonth = 11; lmonth = 11;
subject = calloc(255, sizeof(char)); subject = calloc(255, sizeof(char));
f = bestaka_s(t);
MacroVars("SsKyY", "ssdss", MacroVars("sKyY", "sdss", nodes.Sysop, Notify, ascfnode(t, 0xff), ascfnode(f, 0xf));
CFG.sysop_name,
nodes.Sysop,
Notify,
ascfnode(t, 0xff),
ascfnode(bestaka_s(t), 0xf)
);
if (Notify){ if (Notify){
Syslog('+', "AreaMgr: Flow report to %s", ascfnode(t, 0xff)); Syslog('+', "AreaMgr: Flow report to %s", ascfnode(t, 0xff));
@ -412,14 +398,12 @@ void A_Flow(faddr *t, char *replyid, int Notify)
sprintf(subject,"AreaMgr Flow Report"); sprintf(subject,"AreaMgr Flow Report");
GetRpSubject("areamgr.flow",subject); GetRpSubject("areamgr.flow",subject);
} }
f = bestaka_s(t);
if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid)) != NULL) { if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid)) != NULL) {
fi=NULL; if (Notify) {
if (Notify){ fi = OpenMacro("areamgr.notify.flow", nodes.Language);
fi=OpenMacro("areamgr.notify.flow", nodes.Language); } else {
}else{ fi = OpenMacro("areamgr.flow", nodes.Language);
fi=OpenMacro("areamgr.flow", nodes.Language);
} }
/* /*
* Mark begin of message in .pkt * Mark begin of message in .pkt
@ -432,6 +416,10 @@ void A_Flow(faddr *t, char *replyid, int Notify)
WriteError("$Can't open %s", temp); WriteError("$Can't open %s", temp);
free(temp); free(temp);
free(subject); free(subject);
if (fi) {
fclose(fi);
MacroClear();
}
return; return;
} }
fread(&msgshdr, sizeof(msgshdr), 1, mp); fread(&msgshdr, sizeof(msgshdr), 1, mp);
@ -443,6 +431,10 @@ void A_Flow(faddr *t, char *replyid, int Notify)
free(temp); free(temp);
free(subject); free(subject);
fclose(mp); fclose(mp);
if (fi) {
fclose(fi);
MacroClear();
}
return; return;
} }
fread(&mgrouphdr, sizeof(mgrouphdr), 1, gp); fread(&mgrouphdr, sizeof(mgrouphdr), 1, gp);
@ -468,7 +460,7 @@ void A_Flow(faddr *t, char *replyid, int Notify)
(g->node == f->node) && (g->point == f->point)) { (g->node == f->node) && (g->point == f->point)) {
if (fi != NULL){ if (fi != NULL){
MacroVars("GHI", "sss",mgroup.Name, mgroup.Comment, aka2str(mgroup.UseAka) ); MacroVars("GJI", "sss",mgroup.Name, mgroup.Comment, aka2str(mgroup.UseAka) );
fsetpos(fi,&fileptr); fsetpos(fi,&fileptr);
MacroRead(fi, qp); MacroRead(fi, qp);
fgetpos(fi,&fileptr1); fgetpos(fi,&fileptr1);
@ -496,7 +488,7 @@ void A_Flow(faddr *t, char *replyid, int Notify)
} }
} }
if (fi !=NULL){ if (fi !=NULL){
MacroVars("XAWMTwmtx", "csddddddd", MacroVars("XAPQRpqrx", "csddddddd",
Stat[0], Stat[0],
msgs.Tag, msgs.Tag,
msgs.Received.lweek, msgs.Received.lweek,
@ -584,7 +576,7 @@ void A_Status(faddr *t, char *replyid)
i = 11; i = 11;
else else
i = Miy - 1; i = Miy - 1;
MacroVars("DCHNLRWMTwmtSsYy","ddddcsddddddssss", MacroVars("DCEFGRPQRpqrsYy","ddddcsddddddsss",
nodes.Direct, nodes.Direct,
nodes.Crash, nodes.Crash,
nodes.Hold, nodes.Hold,
@ -597,7 +589,6 @@ void A_Status(faddr *t, char *replyid)
nodes.MailRcvd.lweek, nodes.MailRcvd.lweek,
nodes.MailRcvd.month[i], nodes.MailRcvd.month[i],
nodes.MailRcvd.total, nodes.MailRcvd.total,
CFG.sysop_name,
nodes.Sysop, nodes.Sysop,
ascfnode(t, 0xff), ascfnode(t, 0xff),
ascfnode(bestaka_s(t), 0xf) ascfnode(bestaka_s(t), 0xf)

32
mbfido/filemgr.c
View File

@ -83,16 +83,15 @@ void F_Help(faddr *t, char *replyid)
Syslog('+', "FileMgr: Help"); Syslog('+', "FileMgr: Help");
subject=calloc(255,sizeof(char)); subject=calloc(255,sizeof(char));
sprintf(subject,"FileMgr help"); sprintf(subject,"FileMgr help");
MacroVars("SsNAP", "sssss", CFG.sysop_name, nodes.Sysop, (char *)"Filemgr", ascfnode(bestaka_s(t), 0xf), nodes.Fpasswd );
GetRpSubject("filemgr.help",subject); GetRpSubject("filemgr.help",subject);
if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) { if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) {
if ( (fi=OpenMacro("filemgr.help", nodes.Language)) != NULL ){ if ( (fi=OpenMacro("filemgr.help", nodes.Language)) != NULL ){
MacroVars("SNAP", "ssss", nodes.Sysop, (char *)"Filemgr", ascfnode(bestaka_s(t), 0xf), nodes.Fpasswd ); MacroVars("sAYP", "ssss", nodes.Sysop, (char *)"Filemgr", ascfnode(bestaka_s(t), 0xf), nodes.Fpasswd );
MacroRead(fi, fp); MacroRead(fi, fp);
MacroClear(); MacroClear();
fclose(fi); fclose(fi);
}else{ } else {
fprintf(fp, "Address all requests to '%s' (without quotes)\r", (char *)"Filemgr"); fprintf(fp, "Address all requests to '%s' (without quotes)\r", (char *)"Filemgr");
fprintf(fp, "Your FileMgr password goes on the subject line.\r\r"); fprintf(fp, "Your FileMgr password goes on the subject line.\r\r");
@ -159,14 +158,8 @@ void F_List(faddr *t, char *replyid, int Notify)
fpos_t fileptr,fileptr1,fileptr2; fpos_t fileptr,fileptr1,fileptr2;
subject = calloc(255, sizeof(char)); subject = calloc(255, sizeof(char));
f = bestaka_s(t);
MacroVars("SsKyY", "ssdss", MacroVars("sKyY", "sdss", nodes.Sysop, Notify, ascfnode(t, 0xff), ascfnode(f, 0xf));
CFG.sysop_name,
nodes.Sysop,
Notify,
ascfnode(t, 0xff),
ascfnode(bestaka_s(t), 0xf)
);
if (Notify==LIST_NOTIFY){ if (Notify==LIST_NOTIFY){
Syslog('+', "FileMgr: Notify to %s", ascfnode(t, 0xff)); Syslog('+', "FileMgr: Notify to %s", ascfnode(t, 0xff));
@ -188,7 +181,6 @@ void F_List(faddr *t, char *replyid, int Notify)
sprintf(subject,"FileMgr: Unlinked areas"); sprintf(subject,"FileMgr: Unlinked areas");
GetRpSubject("filemgr.unlink",subject); GetRpSubject("filemgr.unlink",subject);
} }
f = bestaka_s(t);
if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) { if ((qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) {
@ -254,7 +246,7 @@ void F_List(faddr *t, char *replyid, int Notify)
(g->node == f->node) && (g->point == f->point)) { (g->node == f->node) && (g->point == f->point)) {
SubTot = 0; SubTot = 0;
if (fi != NULL){ if (fi != NULL){
MacroVars("GHI", "sss",fgroup.Name, fgroup.Comment, aka2str(fgroup.UseAka) ); MacroVars("GJI", "sss",fgroup.Name, fgroup.Comment, aka2str(fgroup.UseAka) );
fsetpos(fi,&fileptr); fsetpos(fi,&fileptr);
MacroRead(fi, qp); MacroRead(fi, qp);
fgetpos(fi,&fileptr1); fgetpos(fi,&fileptr1);
@ -290,7 +282,7 @@ void F_List(faddr *t, char *replyid, int Notify)
|| ((Notify == LIST_QUERY) && ((Stat[0]=='S') || (Stat[1]=='R'))) || ((Notify == LIST_QUERY) && ((Stat[0]=='S') || (Stat[1]=='R')))
|| ((Notify >= LIST_UNLINK) && ((Stat[0]!='S') && (Stat[1]!='R')))){ || ((Notify >= LIST_UNLINK) && ((Stat[0]!='S') && (Stat[1]!='R')))){
if (fi !=NULL){ if (fi !=NULL){
MacroVars("XTNsrp", "sssddd", MacroVars("XDEsrp", "sssddd",
Stat, tic.Name, tic.Comment, Stat, tic.Name, tic.Comment,
(Stat[0] == 'S'), (Stat[0] == 'S'),
(Stat[1] == 'R'), (Stat[1] == 'R'),
@ -375,7 +367,7 @@ void F_Status(faddr *t, char *replyid)
i = 11; i = 11;
else else
i = Miy - 1; i = Miy - 1;
MacroVars("MTANBDECWabcdefghijklSs", "dddddddddddddddddddddss", MacroVars("ABCDEFGIJabcdefghijkls", "ddddddddddddddddddddds",
nodes.Message, nodes.Message,
nodes.Tic, nodes.Tic,
nodes.AdvTic, nodes.AdvTic,
@ -397,12 +389,10 @@ void F_Status(faddr *t, char *replyid)
nodes.F_KbRcvd.lweek, nodes.F_KbRcvd.lweek,
nodes.F_KbRcvd.month[i], nodes.F_KbRcvd.month[i],
nodes.F_KbRcvd.total, nodes.F_KbRcvd.total,
CFG.sysop_name,
nodes.Sysop nodes.Sysop
); );
GetRpSubject("filemgr.status",subject); GetRpSubject("filemgr.status",subject);
if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) { if ((fp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) {
if ( (fi=OpenMacro("filemgr.status", nodes.Language)) != NULL ){ if ( (fi=OpenMacro("filemgr.status", nodes.Language)) != NULL ){
MacroRead(fi, fp); MacroRead(fi, fp);