From fc1e81d7bee502f4ca1e02f1b42d3b8e1d457ffc Mon Sep 17 00:00:00 2001 From: mysticbbs Date: Fri, 27 Sep 2013 21:00:25 -0400 Subject: [PATCH] updates --- mystic/bbs_cfg_menuedit.pas | 11 ++++++----- mystic/bbs_msgbase.pas | 4 ++-- mystic/mutil_common.pas | 2 +- mystic/mutil_echoexport.pas | 24 +++++++++++++++++++++--- mystic/mystic.pas | 10 +++++----- mystic/todo.pas | 1 + mystic/whatsnew.txt | 3 +++ 7 files changed, 39 insertions(+), 16 deletions(-) diff --git a/mystic/bbs_cfg_menuedit.pas b/mystic/bbs_cfg_menuedit.pas index 9c3ef08..c326057 100644 --- a/mystic/bbs_cfg_menuedit.pas +++ b/mystic/bbs_cfg_menuedit.pas @@ -624,7 +624,7 @@ Var End Else Desc := ''; - List.Add(strPadR(Sort.Data[Count]^.Name, 22, ' ') + Desc, 0); + List.Add(strPadR(Sort.Data[Count]^.Name, mysMaxMenuNameLen + 2, ' ') + Desc, 0); If Sort.Data[Count]^.Name = OldName Then List.Picked := List.ListMax; @@ -703,15 +703,16 @@ Begin Case List.ExitCode of '/' : Case GetCommandOption(10, 'I-Insert|D-Delete|C-Copy|') of 'C' : If List.ListMax > 0 Then - CopyMenu(strWordGet(1, List.List[List.Picked]^.Name, ' ')); + CopyMenu(strStripR(Copy(List.List[List.Picked]^.Name, 1, mysMaxMenuNameLen), ' ')); 'I' : InsertMenu; 'D' : If List.ListMax > 0 Then - If ShowMsgBox(1, 'Delete menu: ' + strWordGet(1, List.List[List.Picked]^.Name, ' ')) Then - FileErase (Theme.MenuPath + strWordGet(1, List.List[List.Picked]^.Name, ' ') + '.mnu'); + If ShowMsgBox(1, 'Delete menu: ' + strStripR(Copy(List.List[List.Picked]^.Name, 1, mysMaxMenuNameLen), ' ')) Then + FileErase (Theme.MenuPath + strStripR(Copy(List.List[List.Picked]^.Name, 1, mysMaxMenuNameLen), ' ') + '.mnu'); End; #13 : Begin If List.ListMax <> 0 Then - Result := strWordGet(1, List.List[List.Picked]^.Name, ' '); + Result := strStripR(Copy(List.List[List.Picked]^.Name, 1, mysMaxMenuNameLen), ' '); + Break; End; #27 : Break; diff --git a/mystic/bbs_msgbase.pas b/mystic/bbs_msgbase.pas index 0fc9552..a135ce8 100644 --- a/mystic/bbs_msgbase.pas +++ b/mystic/bbs_msgbase.pas @@ -635,7 +635,7 @@ Var S : String; A : SmallInt; Begin - If (MBase.NetType > 0) and (MBase.NetType <> 3) and (MBase.QwkNetID = 0) Then Begin + If (MBase.NetType > 0) and (MBase.QwkNetID = 0) Then Begin Msg^.DoStringLn (#1 + 'MSGID: ' + Addr2Str(bbsCfg.NetAddress[MBase.NetAddr]) + ' ' + strI2H(CurDateDos, 8)); If ReplyID <> '' Then @@ -1115,7 +1115,7 @@ Begin Session.User.ThisUser.LastMGroup := FilePos(GroupFile); // use gettotalbases(true) here!? - + If bbsCfg.MShowBases Then Begin Reset (MBaseFile); Read (MBaseFile, tMBase); { Skip EMAIL base } diff --git a/mystic/mutil_common.pas b/mystic/mutil_common.pas index b049c94..21e678a 100644 --- a/mystic/mutil_common.pas +++ b/mystic/mutil_common.pas @@ -376,7 +376,7 @@ Begin Msg^.SetTo (mTo); Msg^.SetSubj (mSubj); - If (mArea.NetType > 0) and (mArea.NetType <> 3) Then + If (mArea.NetType > 0) and (mArea.QwkNetID = 0) Then Msg^.DoStringLn (#1 + 'MSGID: ' + strAddr2Str(bbsCfg.NetAddress[mArea.NetAddr]) + ' ' + strI2H(CurDateDos, 8)); For Count := 1 to mLines Do diff --git a/mystic/mutil_echoexport.pas b/mystic/mutil_echoexport.pas index 1e7399b..cee6964 100644 --- a/mystic/mutil_echoexport.pas +++ b/mystic/mutil_echoexport.pas @@ -62,6 +62,8 @@ Var PKTName : String; BundleName : String; BundlePath : String; + BundleSize : Cardinal; + Temp : String; FLOName : String; OrigAddr : RecEchoMailAddr; Begin @@ -93,10 +95,25 @@ Begin BundleName := BundlePath + GetFTNArchiveName(OrigAddr, EchoNode.Address) + '.' + strLower(DayString[DayOfWeek(CurDateDos)]); BundleName[Length(BundleName)] := '0'; + +(* + BundleName := BundlePath + GetFTNBundleExt(False, GetFTNArchiveName(OrigAddr, EchoNode.Address) + '.' + Copy(strLower(DayString[DayOfWeek(CurDateDos)]), 1, 2) + '0'); - //check for filesize... and... - //force every bundle to increment - //BundleName := GetFTNBundleExt(BundlePath + GetFTNArchiveName(OrigAddr, EchoNode.Address) + '.' + Copy(strLower(DayString[DayOfWeek(CurDateDos)]), 1, 2) + '0'); + BundleName := BundlePath + GetFTNArchiveName(OrigAddr, EchoNode.Address) + '.' + Copy(strLower(DayString[DayOfWeek(CurDateDos)]), 1, 2) + '0'; + Temp := BundleName; + + Repeat + BundleSize := FileByteSize(BundleName); + + If (BundleSize > 0) and ((BundleSize DIV 1024) >= 250) Then Begin + BundleName := GetFTNBundleExt(True, BundleName); + + If BundleName = Temp Then + Break; + End Else + Break; + Until False; +*) Case EchoNode.MailType of 0 : FLOName := FLOName + '.flo'; @@ -250,6 +267,7 @@ Var MH.OrigNode := MsgBase^.GetOrigAddr.Node; MH.OrigNet := MsgBase^.GetOrigAddr.Net; + TempStr1 := FormatDate(DT, 'DD NNN YY HH:II:SS') + #0; Move (TempStr1[1], MH.DateTime[0], 20); diff --git a/mystic/mystic.pas b/mystic/mystic.pas index aab7d48..81d3087 100644 --- a/mystic/mystic.pas +++ b/mystic/mystic.pas @@ -42,14 +42,14 @@ Uses m_Input, m_Pipe, BBS_Records, - bbs_Common, - bbs_DataBase, - bbs_Core, - bbs_NodeInfo, + BBS_Common, + BBS_DataBase, + BBS_Core, + BBS_NodeInfo, {$IFDEF TESTEDITOR} BBS_Edit_Ansi, {$ENDIF} - bbs_Cfg_Main; + BBS_Cfg_Main; {$IFDEF TESTEDITOR} Procedure TestEditor; diff --git a/mystic/todo.pas b/mystic/todo.pas index 9c062b7..4bdc26c 100644 --- a/mystic/todo.pas +++ b/mystic/todo.pas @@ -56,6 +56,7 @@ BUGS AND POSSIBLE ISSUES FUTURE / IDEAS / WORK IN PROGRESS / NOTES ========================================= +- Make point mail bundles based off of their uplink (your address)? - MIS escape confirmation - Prompts for CONFIG editors - matrix disconnect if they use the XL command too many times diff --git a/mystic/whatsnew.txt b/mystic/whatsnew.txt index b8e23bf..3ce7ca1 100644 --- a/mystic/whatsnew.txt +++ b/mystic/whatsnew.txt @@ -3846,4 +3846,7 @@ server and automatically increment packet names (ie we1->we2) until it finds an unused packet name on the remote server. + ! Fixed a bug when using spaces in menu filenames which caused the menu + editor to fail to edit, copy, and delete menus. +