From f24dbddcdbf47b71d0459f7efb7041cfc8821c3d Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sun, 31 Mar 2002 21:33:16 +0000
Subject: [PATCH] Fixed the area/filemgr responses

---
 examples/templates.tar | Bin 40960 -> 40960 bytes
 mbfido/areamgr.c       |   7 ++++---
 mbfido/filemgr.c       |   7 ++++---
 mbfido/mgrutil.c       |  14 ++++++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/examples/templates.tar b/examples/templates.tar
index 9dcad2400dd2131a21f711be407bd53cec70f85f..401da616071ae0269c0332cddc049033ddabe200 100644
GIT binary patch
delta 891
zcmZoTz|?SnX+jaFF@pgR7#kW*td?UjW>7GgY{;0hnUS%O8zD8hnn#Ys2rkE4$c`*0
zBFk!Q3YQc`)u<rHVgQ#@EacaQ+XuE6WH%5n7?_)w8kzxtff0j&p{a?vA%lX^1fV+%
z3mJ*iVrl@=GD!ib$CyYxCdOtaFg>Q&^q86&n?s#uZf<610(6=Y(4lbunEzn0Re%7O
z)WjkMhhiNrhiV56*FYVIAf0emA0KCbUsugqkP@sClXY#>H)q;BW0QuM5}9ABkXV$e
zP@bBToS&O&rQi_Er99cuchMvlq?npq?SdQ~u7#XL1racW&0*g4FJwfH!T>oIVCX@k
zJ`gnqW038NEo4R3mxP>Tk_$PJ<#Lc?K9|^-hq^Hb7>%{qq6AB7F);xq8er6e^wbln
t$IRFe7>!1g%z%0tQNyAM+1<@Vhb<@zK-|!aYF?i#D=_820=NIa005j4!Y=>-

delta 871
zcma))F;Buk7=~L?G)0XLGSVD6D3Qcod%Y&4L)8)|gXlzp17bG_If!v+h^VuQ+)v>T
z@NfJJZu%W5^_npBrZ#V$``&xsZ?ecu7P;wAw-gf&CiE*ZG*>|;$LhmeRoT|R#G`FP
zqlvb|Hf3$UlqWb5i)j!U8cDP=+dWC<E$52aa1_%e4yKk#9jutxArzcgQ}BVAnh|jY
zGDE=F85v?zYsEP07>8mSTf@W@-`H|(VB(P6AB~s2qK<;FGerKVCjL~!sdvN=y#0CG
z``+NE7sX0z@Q6CY5Iu#x?w}vmkbhh7BmcPGtok?A%SIzOZ`CW~!XZDq8qET!6&?k0
z^mV3ZiUZPgR!?g%Rj%vW&_Ie`&`h`0mS^3uyv*Ip>(OPpto7uU`&nC#J@%lo@w)ie
xYz85)EKsvxo-;Dk#<pN6FfZvWUS;2JnX|Q*_X!X0>H9uPc?<l-;eP(^{Q*aPzGVOa

diff --git a/mbfido/areamgr.c b/mbfido/areamgr.c
index 2aef3f49..8c7baefb 100644
--- a/mbfido/areamgr.c
+++ b/mbfido/areamgr.c
@@ -906,7 +906,7 @@ void A_Pause(faddr *t, int Pause, FILE *tmp)
 		    fwrite(&Sys, sizeof(Sys), 1, mp);
 		    Syslog('+', "AreaMgr: %s area %s",  Pause?"Pause":"Resume", msgs.Tag);
 		    MacroVars("SsP", "sss", CFG.sysop_name, nodes.Sysop,"Areamgr");
-		    MacroVars("RABCDE", "ssssss","OK_PAUSE",msgs.Tag,ascfnode(t, 0x1f),"","");
+		    MacroVars("RABCDE", "ssdsss","OK_PAUSE",msgs.Tag,Pause,"","","");
 		    MsgResult("areamgr.responses",tmp);
 		    a_list = TRUE;
 		}
@@ -1088,6 +1088,7 @@ int AreaMgr(faddr *f, faddr *t, char *replyid, char *subj, time_t mdate, int fla
 	if ((np = SendMgrMail(f, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid)) != NULL) {
 	    MacroVars("RABCDE", "ssssss","WELLCOME","","","","","");
 	    MsgResult("areamgr.responses",np);
+	    fprintf(np, "\r");
 	    fseek(tmp, 0, SEEK_SET);
 
 	    while ((fgets(Buf, 2048, tmp)) != NULL) {
@@ -1095,11 +1096,11 @@ int AreaMgr(faddr *f, faddr *t, char *replyid, char *subj, time_t mdate, int fla
 		    Buf[strlen(Buf) - 1] = '\0';
 		}
 		fprintf(np, "%s\r", Buf);
-		Syslog('m', "Rep: %s", Buf);
 	    }
+	    fprintf(np, "\r");
 	    MacroVars("RABCDE", "ssssss","GOODBYE","","","","","");
 	    MsgResult("areamgr.responses",np);
-	    fprintf(np, "%s\r", TearLine());
+	    fprintf(np, "\r%s\r", TearLine());
 	    CloseMail(np, t);
 	} else
 	    WriteError("Can't create netmail");
diff --git a/mbfido/filemgr.c b/mbfido/filemgr.c
index b0e9cbf7..d4204f6a 100644
--- a/mbfido/filemgr.c
+++ b/mbfido/filemgr.c
@@ -698,7 +698,7 @@ void F_Pause(faddr *t, int Pause, FILE *tmp)
 		    fwrite(&Sys, sizeof(Sys), 1, fp);
 		    Syslog('+', "FileMgr: %s area %s",  Pause?"Pause":"Resume", tic.Name);
 		    MacroVars("SsP", "sss", CFG.sysop_name, nodes.Sysop,"FileMgr");
-		    MacroVars("RABCDE", "ssssss","OK_PAUSE",tic.Name,ascfnode(t, 0x1f),"","");
+		    MacroVars("RABCDE", "ssdsss","OK_PAUSE",tic.Name,Pause,"","","");
 		    MsgResult("filemgr.responses",tmp);
 		    f_list = TRUE;
 		}
@@ -887,6 +887,7 @@ int FileMgr(faddr *f, faddr *t, char *replyid, char *subj, time_t mdate, int fla
 	if ((np = SendMgrMail(f, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid)) != NULL) {
 	    MacroVars("RABCDE", "ssssss","WELLCOME","","","","","");
 	    MsgResult("filemgr.responses",np);
+	    fprintf(np, "\r");
 	    fseek(tmp, 0, SEEK_SET);
 
 	    while ((fgets(Buf, 2048, tmp)) != NULL) {
@@ -894,12 +895,12 @@ int FileMgr(faddr *f, faddr *t, char *replyid, char *subj, time_t mdate, int fla
 		    Buf[strlen(Buf) - 1] = '\0';
 		}
 		fprintf(np, "%s\r", Buf);
-		Syslog('m', "Rep: %s", Buf);
 	    }
 
+	    fprintf(np, "\r");
 	    MacroVars("RABCDE", "ssssss","GOODBYE","","","","","");
 	    MsgResult("filemgr.responses",np);
-	    fprintf(np, "%s\r", TearLine());
+	    fprintf(np, "\r%s\r", TearLine());
 	    CloseMail(np, t);
 	} else 
 	    WriteError("Can't create netmail");
diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c
index cf20b2c4..6213762d 100644
--- a/mbfido/mgrutil.c
+++ b/mbfido/mgrutil.c
@@ -270,7 +270,7 @@ void MgrNotify(faddr *t, char *Buf, FILE *tmp, int mgr)
 	SearchNodeFaddr(t);
 	Syslog('+', "XxxxMgr: Notify %s", nodes.Notify?"Yes":"No");
 	MacroVars("SsP", "sss", CFG.sysop_name, nodes.Sysop,mgr?(char *)"Filemgr":(char *)"Areamgr");
-	MacroVars("RABCDE", "ssssss",(char *)"OK_PASS",nodes.Apasswd,(char *)"",(char *)"",(char *)"",(char *)"");
+	MacroVars("RABCDE", "sdssss",(char *)"NOTIFY",nodes.Notify,(char *)"",(char *)"",(char *)"",(char *)"");
 	MsgResult(mgr?"filemgr.responses":"areamgr.responses",tmp);
 	MacroClear();
 }
@@ -433,14 +433,19 @@ void GetRpSubject(const char *report, char* subject)
 int MsgResult(const char * report, FILE *fo)
 {
     FILE    *fi;
-    char    *temp;
+    char    *temp, *resp;
     int	    res;
 
     temp = calloc(256,sizeof(char)); 
+    resp = calloc(256,sizeof(char));
+
     if ((fi = OpenMacro(report, nodes.Language)) != NULL){
         while ( fgets(temp, 254, fi) != NULL ){
-	    if (temp[0] != '#')
-		fprintf(fo,"%s\r",ParseMacro(temp,&res));
+	    if (temp[0] != '#') {
+		strncpy(resp, ParseMacro(temp, &res), 80);
+		if ((res == 0) && strlen(resp))
+		    fprintf(fo,"%s\r",ParseMacro(temp,&res));
+	    }
 	}
         fclose(fi);
         res=1;
@@ -448,6 +453,7 @@ int MsgResult(const char * report, FILE *fo)
         res = 0;
     }
 
+    free(resp);
     free(temp);
     return res;
 }