From 063ee8e631d025a0d8b529e855c3b2a6bd69d3bb Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sun, 2 Feb 2003 15:03:40 +0000
Subject: [PATCH] Fixes for handles in mbsebbs, fixes for areamgr listings

---
 ChangeLog        |  7 +++++++
 TODO             | 11 -----------
 mbfido/areamgr.c | 10 ++++++++++
 mbfido/filemgr.c | 10 ++++++++++
 mbsebbs/mail.c   | 23 ++++++++++++++++++++++-
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9a037e7..52f84b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@ v0.37.01	14-Jan-2003.
 
 	mbfido:
 		Removed all code for charset translation.
+		In areamgr/filemgr lists the messages are forced splitted when
+		the force limit is reached in the middle of a group listing.
 
 	mbsetup:
 		Added protection against wrong database sizes depending on
@@ -46,6 +48,11 @@ v0.37.01	14-Jan-2003.
 	mbsebbs:
 		It will now refuse to up/download OLR packets when the system
 		bbs id is not set in the global setup.
+		When a reply is made on a message in a area which allows
+		aliases, the user is asked to use his alias.
+		When a reply is made on a message in a newsgroup and your
+		systems has a permanent mail domain the email address is used
+		as from name.
 
 
 v0.37.00	26-Dec-2002 - 14-Jan-2003
diff --git a/TODO b/TODO
index 4da8b250..e753a622 100644
--- a/TODO
+++ b/TODO
@@ -13,10 +13,6 @@ $Id$
 		 N = Normal, second priority.
                  L = Cosmetic or nice to have.
 
-general:
-	N: Add the default root domain DNS lookup if no DNS info is available
-	   in the nodelist. Setting per zone.
-
 libdiesel.a:
 	U: Processed stringlines containing unbalanced " characters are not
 	   processed, instead the previous macro value will be returned.
@@ -43,7 +39,6 @@ mbsebbs:
 	N: If a new mailcheck takes longer then the idle timeout, the user is 
 	   disconnected as soon as the mailcheck is ready.
 
-	N: In mail areas for only Alias names, the normal usernames show up.
 
 mbfido:
 	U: Code cleanup and make a structure in this program. Remove duplicate
@@ -52,10 +47,6 @@ mbfido:
 	N: Remove memory leak during toss. (It's ok for less 5000 messages for 
 	   each run).
 
-	N: When a news article is received from a mailinglist there is a valid
-	   To: address in the message, the gate doesn't see that and uses the
-	   name to "All".
-
 	U: GoldED netmail from points, FMPT kludge is missing.
 
 	U: GoldED messages to internet becomes null.
@@ -97,8 +88,6 @@ mbfido:
 
 	N: Send notifications to downlinks about changed areas from uplink.
 
-	N: Better areamgr message split.
-
 mbcico:
 	N: Implement MD5 crypt in binkp protocol driver.
 
diff --git a/mbfido/areamgr.c b/mbfido/areamgr.c
index 07b1c0c0..67df61a6 100644
--- a/mbfido/areamgr.c
+++ b/mbfido/areamgr.c
@@ -267,6 +267,16 @@ void A_List(faddr *t, char *replyid, int Notify)
 				fgetpos(fi,&fileptr2);
 			        SubTot++;
   			        Total++;
+				/*
+				 * Panic message split
+				 */
+				if (((ftell(qp) - msgptr) / 1024) >= CFG.new_force) {
+				    MacroVars("Z","d",1);
+				    Syslog('-', "  Forced splitting message at %ld bytes", ftell(qp) - msgptr);
+				    CloseMail(qp, t);
+				    qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Areamgr", subject, replyid);
+				    msgptr = ftell(qp);
+				}
 			    }
 			} else
 			    fseek(mp, msgshdr.syssize, SEEK_CUR);
diff --git a/mbfido/filemgr.c b/mbfido/filemgr.c
index f957a9bf..d0e0db5f 100644
--- a/mbfido/filemgr.c
+++ b/mbfido/filemgr.c
@@ -252,6 +252,16 @@ void F_List(faddr *t, char *replyid, int Notify)
 				fgetpos(fi,&fileptr2);
 			    	SubTot++;
 			    	Total++;
+				/*
+				 * Panic message split
+				 */
+				if (((ftell(qp) - msgptr) / 1024) >= CFG.new_force) {
+				    MacroVars("Z","d",1);
+				    Syslog('-', "  Forced splitting message at %ld bytes", ftell(qp) - msgptr);
+				    CloseMail(qp, t);
+				    qp = SendMgrMail(t, CFG.ct_KeepMgr, FALSE, (char *)"Filemgr", subject, replyid);
+				    msgptr = ftell(qp);
+				}
 			    }
 			} else
 			    fseek(fp, tichdr.syssize, SEEK_CUR);
diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c
index 509b4cf8..6da2aefc 100644
--- a/mbsebbs/mail.c
+++ b/mbsebbs/mail.c
@@ -1272,7 +1272,28 @@ void Reply_Msg(int IsReply)
     strncpy(Msg.ReplyAddr, replyaddr, 80);
 
     /* From     : */
-    strncpy(Msg.From, exitinfo.sUserName, 100);
+    if (Alias_Option()) {
+	/*
+	 * Set handle
+	 */
+	strcpy(Msg.From, exitinfo.sHandle);
+	tlcap(Msg.From); // Do we want this???
+    } else {
+	if (msgs.Type == NEWS) {
+	    if (CFG.EmailMode != E_PRMISP) {
+		/*
+		 * If no inernet mail domain, use fidonet addressing
+		 */
+		strcpy(Msg.From, exitinfo.sUserName);
+		tlcap(Msg.From);
+	    } else {
+		sprintf(Msg.From, "%s@%s (%s)", exitinfo.Name, CFG.sysdomain, exitinfo.sUserName);
+	    }
+	} else {
+	    strncpy(Msg.From, exitinfo.sUserName, 100);
+	    tlcap(Msg.From);
+	}
+    }
     pout(YELLOW, BLACK, (char *) Language(209));
     pout(CFG.MsgInputColourF, CFG.MsgInputColourB, Msg.From);
     Enter(1);