From da114917c7cb2fbf965151668c5eb83fa81c4f07 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Wed, 22 Jan 2003 18:52:27 +0000
Subject: [PATCH] Fixes for calling non-CM and Txx nodes

---
 ChangeLog        |  3 ++-
 mbtask/outstat.c | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d7396d0..bf4bbaaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,8 @@ v0.37.01	14-Jan-2003.
 		Spanish templates and macros added to the examples.
 
 	mbtask:
-		Added debug logging to find some errors.
+		Arcmail for non-CM nodes and Txx nodes is now sent during the
+		node's opening hours or ZMH.
 
 	mbfile:
 		In the import function several bugfixes for reading files.bbs.
diff --git a/mbtask/outstat.c b/mbtask/outstat.c
index 245d9e5b..fe3c82a9 100644
--- a/mbtask/outstat.c
+++ b/mbtask/outstat.c
@@ -334,8 +334,8 @@ int outstat()
 	}
 
 	rc = load_node(tmp->addr);
-	Syslog('o', "Load node %s rc=%s, NoCall=%s, NoTCP=%s", fido2str(tmp->addr, 0x0f), rc?"true":"false",
-		    nodes.NoCall?"True":"False", (itnmask + ibnmask + ifcmask)?"False":"True");
+//	Syslog('o', "Load node %s rc=%s, NoCall=%s, NoTCP=%s", fido2str(tmp->addr, 0x0f), rc?"true":"false",
+//		    nodes.NoCall?"True":"False", (itnmask + ibnmask + ifcmask)?"False":"True");
 
 	/*
 	 * Zone Mail Hours, only use Fidonet Hours.
@@ -395,7 +395,7 @@ int outstat()
 	    else
 		tmin = 30;
 	    sprintf(be, "%02d:%02d", thour, tmin);
-	    Syslog('o', "Setting next hour for Txx node at %s", be);
+//	    Syslog('o', "Setting next hour for Txx node at %s", be);
 	    set_next(thour, tmin);
 	    if (strcmp(as, be) > 0) {
 		/*
@@ -411,7 +411,7 @@ int outstat()
 		    T_window = TRUE;
 	    }
 	}
-	Syslog('o', "T_window=%s, iszmh=%s", T_window?"true":"false", iszmh?"true":"false");
+//	Syslog('o', "T_window=%s, iszmh=%s", T_window?"true":"false", iszmh?"true":"false");
 	strcpy(flstr,"...... .... ..");
 
 	/*
@@ -455,8 +455,15 @@ int outstat()
 	    tmp->flavors |= F_CALL;
 	}
 
-	if ((tmp->flavors) & F_ISFIL )
+	if ((tmp->flavors) & F_ISFIL ) {
 	    flstr[7]='A';
+	    /*
+	     * Arcmail and maybe file attaches, send during ZMH or if node has a Txx window.
+	     */
+	    if (iszmh || T_window) {
+		tmp->flavors |= F_CALL;
+	    }
+	}
 	if ((tmp->flavors) & F_ISPKT ) { 
 	    flstr[8]='M';
 	    /*