diff --git a/mystic/bbs_cfg_msgbase.pas b/mystic/bbs_cfg_msgbase.pas index 1f722f0..19c9bf1 100644 --- a/mystic/bbs_cfg_msgbase.pas +++ b/mystic/bbs_cfg_msgbase.pas @@ -150,7 +150,6 @@ Begin Form.AddTog ('B', ' Base Format' , 53, 20, 68, 20, 13, 6, 0, 1, 'JAM Squish', @MBase.BaseType, Topic + 'Message base storage format'); Form.AddStr ('H', ' Header' , 58, 21, 68, 21, 8, 9, 20, @MBase.Header, Topic + 'Display file name of msg header'); - Repeat WriteXY (19, 16, 113, strPadR(strAddr2Str(Config.NetAddress[MBase.NetAddr]), 19, ' ')); @@ -206,6 +205,7 @@ Var List : TAnsiMenuList; Copied : RecMessageBase; HasCopy : Boolean = False; + CopyIdx : LongInt; MBaseFile : File of RecMessageBase; MBase : RecMessageBase; @@ -419,6 +419,7 @@ Var With MBase Do Begin Index := GetPermanentIndex(FileSize(MBaseFile)); + Created := CurDateDos; FileName := 'new'; Path := Config.MsgsPath; @@ -500,7 +501,7 @@ Begin Case List.ExitCode of '/' : If Edit Then - Case GetCommandOption(8, 'I-Insert|D-Delete|C-Copy|P-Paste|G-Global|S-Sort|') of + Case GetCommandOption(8, 'I-Insert|D-Delete|C-Copy|M-Move|P-Paste|G-Global|S-Sort|') of 'I' : If List.Picked > 1 Then Begin AssignRecord(False); MakeList; @@ -537,11 +538,26 @@ Begin MakeList; End; 'C' : If List.Picked <> List.ListMax Then Begin - Seek (MBaseFile, List.Picked - 1); + CopyIdx := List.Picked; + + Seek (MBaseFile, CopyIdx - 1); Read (MBaseFile, Copied); HasCopy := True; End; + 'M' : If HasCopy And (List.Picked > 1) Then Begin + AddRecord (MBaseFile, List.Picked, SizeOf(MBase)); + Write (MBaseFile, Copied); + + If List.Picked <= CopyIdx Then + Inc(CopyIdx); + + KillRecord (MBaseFile, CopyIdx, SizeOf(MBase)); + + MakeList; + + HasCopy := False; + End; 'P' : If HasCopy And (List.Picked > 1) Then Begin AddRecord (MBaseFile, List.Picked, SizeOf(MBase)); diff --git a/mystic/bbs_msgbase_ansi.pas b/mystic/bbs_msgbase_ansi.pas index 678d02c..7233028 100644 --- a/mystic/bbs_msgbase_ansi.pas +++ b/mystic/bbs_msgbase_ansi.pas @@ -419,18 +419,25 @@ Begin PipeCode := PipeCode + Ch; If Length(PipeCode) = 2 Then Begin - If PipeCode = '00' Then - SetFore(0) - Else - Case strS2I(PipeCode) of - 01.. - 15 : SetFore(strS2I(PipeCode)); - 16.. - 23 : SetBack(strS2I(PipeCode) - 16); - Else - AddChar('|'); - OneChar(PipeCode[1]); - OneChar(PipeCode[2]); + If (PipeCode[1] in ['0'..'2']) and (PipeCode[2] in ['0'..'9']) Then Begin + If PipeCode = '00' Then + SetFore(0) + Else Begin + Case strS2I(PipeCode) of + 01.. + 15 : SetFore(strS2I(PipeCode)); + 16.. + 23 : SetBack(strS2I(PipeCode) - 16); + Else + AddChar ('|'); + OneChar (PipeCode[1]); + OneChar (PipeCode[2]); + End; + End; + End Else Begin + AddChar ('|'); + OneChar (PipeCode[1]); + OneChar (PipeCode[2]); End; GotPipe := False; diff --git a/mystic/bbs_user.pas b/mystic/bbs_user.pas index ddfa8cc..29ae462 100644 --- a/mystic/bbs_user.pas +++ b/mystic/bbs_user.pas @@ -118,7 +118,10 @@ End; Function TBBSUser.IsThisUser (Str: String) : Boolean; Begin - Str := strUpper(Str); + Str := strUpper(Str); + + //If Str = 'SYSOP' Then Str := Config.SysopName; + Result := (strUpper(ThisUser.RealName) = Str) or (strUpper(ThisUser.Handle) = Str); End; diff --git a/mystic/mutil.ini b/mystic/mutil.ini index 700e7a2..f512b37 100644 --- a/mystic/mutil.ini +++ b/mystic/mutil.ini @@ -71,7 +71,7 @@ PurgeMessageBases = false PostTextFiles = false PackMessageBases = false - ImportEchoMail = false + ImportEchoMail = true ExportEchoMail = false ; ========================================================================== @@ -420,8 +420,8 @@ ; If you want to forward netmail from one user name to another, you can ; define up to 50 remapped names below using the format ; ; - ; forward = sysop;g00r00 - ; forward = system operator;g00r00 + forward = sysop;g00r00 + forward = system operator;g00r00 ; If you want MUTIL to auto create message bases when it finds an ; echomail message for a non-existing base, set this value to true diff --git a/mystic/mutil_echocore.pas b/mystic/mutil_echocore.pas index 5fcd191..32f34af 100644 --- a/mystic/mutil_echocore.pas +++ b/mystic/mutil_echocore.pas @@ -329,8 +329,8 @@ Begin If First Then Begin First := False; - If Pos('AREA:', MsgText[MsgLines]^) = 1 Then Begin - MsgArea := Copy(MsgText[MsgLines]^, 6, 255); + If Copy(MsgText[MsgLines]^, 1, 5) = 'AREA:' Then Begin + MsgArea := strUpper(Copy(MsgText[MsgLines]^, 6, 255)); MsgText[MsgLines]^ := ''; diff --git a/mystic/mutil_echoexport.pas b/mystic/mutil_echoexport.pas index 5ddea61..6cecb25 100644 --- a/mystic/mutil_echoexport.pas +++ b/mystic/mutil_echoexport.pas @@ -193,7 +193,7 @@ Var Assign (F, TempStr1); - AddToFloQueue (TempStr2, TempStr1); +// AddToFloQueue (TempStr2, TempStr1); Inc (TotalNet); End Else Begin diff --git a/mystic/mystic.pas b/mystic/mystic.pas index 52697c9..77433b4 100644 --- a/mystic/mystic.pas +++ b/mystic/mystic.pas @@ -63,7 +63,7 @@ Begin Assign (ConfigFile, 'mystic.dat'); if ioReset(ConfigFile, SizeOf(RecConfig), fmReadWrite + fmDenyNone) Then Begin - Read (ConfigFile, Config); + Read (ConfigFile, Config); Close (ConfigFile); End Else Begin WriteLn('ERROR: Unable to read mystic.dat'); diff --git a/mystic/records.pas b/mystic/records.pas index e938061..2aa52b0 100644 --- a/mystic/records.pas +++ b/mystic/records.pas @@ -23,7 +23,7 @@ Const mysSoftwareID = 'Mystic'; // no idea mysCopyYear = '1997-2013'; // its been a long time! - mysVersion = '1.10 A32'; // current version + mysVersion = '1.10 A33'; // current version mysDataChanged = '1.10 A11'; // version of last records change {$IFDEF WIN32} diff --git a/mystic/todo.pas b/mystic/todo.pas index 771f550..fae1583 100644 --- a/mystic/todo.pas +++ b/mystic/todo.pas @@ -26,6 +26,8 @@ BUGS AND POSSIBLE ISSUES FUTURE / IDEAS / WORK IN PROGRESS / NOTES ========================================= +- AREAS.BBS import? +- PGUP/DOWN moves bases in message base editor? - AreaFix - Echomail export saves last scanned pointers - Echomail export support for points diff --git a/mystic/whatsnew.txt b/mystic/whatsnew.txt index 75b9954..1b13f27 100644 --- a/mystic/whatsnew.txt +++ b/mystic/whatsnew.txt @@ -3260,3 +3260,15 @@ End. + + ! Fixed a small pipe code display bug in the new FS editor. + + + MUTIL echo import now ignores case of echotag when trying to match. + + ! MUTIL no longer adds netmail messages to a Binkley FLO file when exporting + echomail. + + ! FIDOPOLL no longer expects netmail packets to be in a FLO file. + + + Message base editor now has a Move command. You must first Copy a message + base, and then move to where you want to move it to and then /M to move it.