Reformatting

This commit is contained in:
mysticbbs 2012-02-26 12:54:24 -05:00
parent f4162f4da3
commit c25341b0f1
1 changed files with 109 additions and 27 deletions

View File

@ -145,7 +145,9 @@ Begin
If OpenCreateBase(TempMsg, TempBase) Then Begin If OpenCreateBase(TempMsg, TempBase) Then Begin
Result := TempMsg^.NumberOfMsgs; Result := TempMsg^.NumberOfMsgs;
TempMsg^.CloseMsgBase; TempMsg^.CloseMsgBase;
Dispose (TempMsg, Done); Dispose (TempMsg, Done);
End; End;
End; End;
@ -321,7 +323,9 @@ Begin
Until False; Until False;
Close (MBaseFile); Close (MBaseFile);
MBase := Old; MBase := Old;
Exit; Exit;
End; End;
@ -329,16 +333,21 @@ Begin
If A > 0 Then Begin If A > 0 Then Begin
Inc (A); Inc (A);
Reset (MBaseFile); Reset (MBaseFile);
If A <= FileSize(MBaseFile) Then Begin If A <= FileSize(MBaseFile) Then Begin
Seek (MBaseFile, A-1); Seek (MBaseFile, A-1);
Read (MBaseFile, MBase); Read (MBaseFile, MBase);
If Session.User.Access(MBase.ListACS) Then Begin If Session.User.Access(MBase.ListACS) Then Begin
Session.User.ThisUser.LastMBase := FilePos(MBaseFile) Session.User.ThisUser.LastMBase := FilePos(MBaseFile)
End Else End Else
MBase := Old; MBase := Old;
End; End;
Close (MBaseFile); Close (MBaseFile);
Exit; Exit;
End; End;
@ -463,7 +472,9 @@ Var
Repeat Repeat
Read (MBaseFile, MBase); Read (MBaseFile, MBase);
If Session.User.Access(MBase.ListACS) Then Inc(B); If Session.User.Access(MBase.ListACS) Then Inc(B);
If A = B Then Break; If A = B Then Break;
Until False; Until False;
@ -519,8 +530,11 @@ Begin
Repeat Repeat
Session.io.OutFull (Session.GetPrompt(95)); Session.io.OutFull (Session.GetPrompt(95));
Temp := Session.io.GetInput(11, 11, 12, ''); Temp := Session.io.GetInput(11, 11, 12, '');
If (Temp = '') or (Temp = 'Q') Then Break; If (Temp = '') or (Temp = 'Q') Then Break;
If Temp = '?' Then If Temp = '?' Then
List_Bases List_Bases
Else Begin Else Begin
@ -538,6 +552,7 @@ Begin
Until False; Until False;
Close (MBaseFile); Close (MBaseFile);
MBase := Old; MBase := Old;
End; End;
@ -589,6 +604,7 @@ Begin
Close (GroupFile); Close (GroupFile);
Group := tGroup; Group := tGroup;
Exit; Exit;
End; End;
@ -640,10 +656,12 @@ Begin
If Config.MShowBases Then Begin If Config.MShowBases Then Begin
Reset (MBaseFile); Reset (MBaseFile);
Read (MBaseFile, tMBase); { Skip EMAIL base } Read (MBaseFile, tMBase); { Skip EMAIL base }
While Not Eof(MBaseFile) Do Begin While Not Eof(MBaseFile) Do Begin
Read (MBaseFile, tMBase); Read (MBaseFile, tMBase);
If Session.User.Access(tMBase.ListACS) Then Inc(Areas); If Session.User.Access(tMBase.ListACS) Then Inc(Areas);
End; End;
Close (MBaseFile); Close (MBaseFile);
End; End;
@ -927,7 +945,9 @@ Var
Procedure ReadText; Procedure ReadText;
Begin Begin
MsgBase^.MsgTxtStartUp; MsgBase^.MsgTxtStartUp;
Lines := 0; Lines := 0;
While Not MsgBase^.EOM and (Lines < mysMaxMsgLines) Do Begin While Not MsgBase^.EOM and (Lines < mysMaxMsgLines) Do Begin
Inc (Lines); Inc (Lines);
MsgText[Lines] := MsgBase^.GetString(79); MsgText[Lines] := MsgBase^.GetString(79);
@ -956,9 +976,12 @@ Begin
Case Session.io.OneKey('ABQ!', True) of Case Session.io.OneKey('ABQ!', True) of
'A' : Begin 'A' : Begin
Session.io.OutFull (Session.GetPrompt(297)); Session.io.OutFull (Session.GetPrompt(297));
If MBase.NetType = 3 Then Begin If MBase.NetType = 3 Then Begin
Temp1 := Session.io.GetInput(30, 30, 11, MsgBase^.GetTo); Temp1 := Session.io.GetInput(30, 30, 11, MsgBase^.GetTo);
Session.io.OutFull (Session.GetPrompt(298)); Session.io.OutFull (Session.GetPrompt(298));
If strStr2Addr(Session.io.GetInput(20, 20, 12, strAddr2Str(DestAddr)), DestAddr) Then Begin If strStr2Addr(Session.io.GetInput(20, 20, 12, strAddr2Str(DestAddr)), DestAddr) Then Begin
MsgBase^.SetTo(Temp1); MsgBase^.SetTo(Temp1);
MsgBase^.SetDest(DestAddr) MsgBase^.SetDest(DestAddr)
@ -974,10 +997,12 @@ Begin
End; End;
'B' : Begin 'B' : Begin
Session.io.OutFull (Session.GetPrompt(299)); Session.io.OutFull (Session.GetPrompt(299));
MsgBase^.SetSubj(Session.io.GetInput(50, 50, 11, MsgBase^.GetSubj)); MsgBase^.SetSubj(Session.io.GetInput(50, 50, 11, MsgBase^.GetSubj));
End; End;
'!' : Begin '!' : Begin
Temp1 := MsgBase^.GetSubj; Temp1 := MsgBase^.GetSubj;
If Editor(Lines, 78, mysMaxMsgLines, False, False, Temp1) Then If Editor(Lines, 78, mysMaxMsgLines, False, False, Temp1) Then
MsgBase^.SetSubj(Temp1) MsgBase^.SetSubj(Temp1)
Else Else
@ -1033,10 +1058,12 @@ Begin
If OK Then Begin If OK Then Begin
Assign (TF, FN); Assign (TF, FN);
Reset (TF); Reset (TF);
While Not Eof(TF) and (CurLine < mysMaxMsgLines) Do Begin While Not Eof(TF) and (CurLine < mysMaxMsgLines) Do Begin
ReadLn (TF, MsgText[CurLine]); ReadLn (TF, MsgText[CurLine]);
Inc (CurLine); Inc (CurLine);
End; End;
Close (TF); Close (TF);
End; End;
@ -1195,13 +1222,18 @@ Var
WriteLn (TF, 'Date: ' + MsgBase^.GetDate + ' ' + MsgBase^.GetTime); WriteLn (TF, 'Date: ' + MsgBase^.GetDate + ' ' + MsgBase^.GetTime);
WriteLn (TF, 'Base: ' + MBase.Name); WriteLn (TF, 'Base: ' + MBase.Name);
WriteLn (TF, ''); WriteLn (TF, '');
MsgBase^.MsgTxtStartUp; MsgBase^.MsgTxtStartUp;
While Not MsgBase^.EOM Do Begin While Not MsgBase^.EOM Do Begin
Temp := MsgBase^.GetString(79); Temp := MsgBase^.GetString(79);
If Temp[1] <> #1 Then WriteLn (TF, Temp); If Temp[1] <> #1 Then WriteLn (TF, Temp);
End; End;
Close (TF); Close (TF);
Session.io.OutFullLn (Session.GetPrompt(327)); Session.io.OutFullLn (Session.GetPrompt(327));
If Not Session.LocalMode Then Begin If Not Session.LocalMode Then Begin
Session.FileBase.SendFile(FN); Session.FileBase.SendFile(FN);
FileErase(FN); FileErase(FN);
@ -1273,6 +1305,7 @@ Var
If MBase.NetType = 3 Then Begin If MBase.NetType = 3 Then Begin
MsgBase^.GetOrig(NetAddr); MsgBase^.GetOrig(NetAddr);
Session.io.PromptInfo[1] := Session.io.PromptInfo[1] + ' (' + strAddr2Str(NetAddr) + ')'; Session.io.PromptInfo[1] := Session.io.PromptInfo[1] + ' (' + strAddr2Str(NetAddr) + ')';
End; End;
@ -1302,6 +1335,7 @@ Var
B : Byte; B : Byte;
Begin Begin
B := Pos('>', strStripL(Str, ' ')); B := Pos('>', strStripL(Str, ' '));
If (B > 0) and (B < 5) Then Begin If (B > 0) and (B < 5) Then Begin
Session.io.AnsiColor(MBase.ColQuote); Session.io.AnsiColor(MBase.ColQuote);
Session.io.OutPipe (Str); Session.io.OutPipe (Str);
@ -1391,15 +1425,17 @@ Var
If MsgBase^.GetMsgNum > LastRead Then LastRead := MsgBase^.GetMsgNum; If MsgBase^.GetMsgNum > LastRead Then LastRead := MsgBase^.GetMsgNum;
CurMsg := MsgBase^.GetMsgNum; CurMsg := MsgBase^.GetMsgNum;
Session.io.AllowArrow := True;
Lines := 0; Lines := 0;
PageStart := 1; PageStart := 1;
Session.io.AllowArrow := True;
MsgBase^.MsgTxtStartUp; MsgBase^.MsgTxtStartUp;
While Not MsgBase^.EOM And (Lines < mysMaxMsgLines) Do Begin While Not MsgBase^.EOM And (Lines < mysMaxMsgLines) Do Begin
Inc (Lines); Inc (Lines);
MsgText[Lines] := MsgBase^.GetString(79);//HERE
MsgText[Lines] := MsgBase^.GetString(79);
If MsgText[Lines][1] = #1 Then Begin If MsgText[Lines][1] = #1 Then Begin
If Copy(MsgText[Lines], 1, 6) = #1 + 'MSGID' Then If Copy(MsgText[Lines], 1, 6) = #1 + 'MSGID' Then
@ -1414,7 +1450,7 @@ Var
Session.io.ScreenInfo[4].Y := 0; Session.io.ScreenInfo[4].Y := 0;
Session.io.ScreenInfo[5].Y := 0; Session.io.ScreenInfo[5].Y := 0;
Session.io.OutFile ('ansimrd', True, 0); Session.io.OutFile (MBase.RTemplate, True, 0);
PageSize := Session.io.ScreenInfo[2].Y - Session.io.ScreenInfo[1].Y + 1; PageSize := Session.io.ScreenInfo[2].Y - Session.io.ScreenInfo[1].Y + 1;
@ -1686,7 +1722,7 @@ Var
Begin Begin
CheckNodeMessages; CheckNodeMessages;
Session.io.OutFile ('ansimlst', True, 0); Session.io.OutFile (MBase.ITemplate, True, 0);
PageSize := Session.io.ScreenInfo[2].Y - Session.io.ScreenInfo[1].Y + 1; PageSize := Session.io.ScreenInfo[2].Y - Session.io.ScreenInfo[1].Y + 1;
End; End;
@ -1870,6 +1906,7 @@ Var
#77, #77,
#81 : Begin #81 : Begin
MsgBase^.SeekFirst(MsgInfo[PageTotal].Num); MsgBase^.SeekFirst(MsgInfo[PageTotal].Num);
If Read_Page(False, False, False) Then Begin If Read_Page(False, False, False) Then Begin
If PagePos > PageTotal Then PagePos := PageTotal; If PagePos > PageTotal Then PagePos := PageTotal;
End Else Begin End Else Begin
@ -1888,7 +1925,9 @@ Var
Case Ch of Case Ch of
#13 : Begin #13 : Begin
MsgBase^.SeekFirst(MsgInfo[PagePos].Num); MsgBase^.SeekFirst(MsgInfo[PagePos].Num);
SeekNextMsg (True, False); SeekNextMsg (True, False);
If Ansi_View_Message Then Break; If Ansi_View_Message Then Break;
MsgBase^.SeekFirst(MsgInfo[1].Num); MsgBase^.SeekFirst(MsgInfo[1].Num);
@ -2045,15 +2084,20 @@ Var
End; End;
'J' : Begin 'J' : Begin
B := MsgBase^.GetMsgNum; B := MsgBase^.GetMsgNum;
Session.io.OutFull (Session.GetPrompt(334)); Session.io.OutFull (Session.GetPrompt(334));
A := strS2I(Session.io.GetInput(9, 9, 12, '')); A := strS2I(Session.io.GetInput(9, 9, 12, ''));
If (A > 0) and (A <= MsgBase^.GetHighMsgNum) Then Begin If (A > 0) and (A <= MsgBase^.GetHighMsgNum) Then Begin
MsgBase^.SeekFirst(A); MsgBase^.SeekFirst(A);
If Not SeekNextMsg(True, False) Then Begin If Not SeekNextMsg(True, False) Then Begin
MsgBase^.SeekFirst(B); MsgBase^.SeekFirst(B);
SeekNextMsg(True, False); SeekNextMsg(True, False);
End; End;
End; End;
Break; Break;
End; End;
'L' : Begin 'L' : Begin
@ -2065,6 +2109,7 @@ Var
While SeekNextMsg(False, False) Do Begin While SeekNextMsg(False, False) Do Begin
Assign_Header_Info; Assign_Header_Info;
Session.io.OutFullLn (Session.GetPrompt(412)); Session.io.OutFullLn (Session.GetPrompt(412));
If (Session.io.PausePtr = Session.User.ThisUser.ScreenSize) and (Session.io.AllowPause) Then If (Session.io.PausePtr = Session.User.ThisUser.ScreenSize) and (Session.io.AllowPause) Then
@ -2082,6 +2127,7 @@ Var
'M' : Begin 'M' : Begin
If Move_Message Then If Move_Message Then
If Not SeekNextMsg(False, False) Then Exit; If Not SeekNextMsg(False, False) Then Exit;
Break; Break;
End; End;
#13, #13,
@ -2091,10 +2137,12 @@ Var
MsgBase^.SeekFirst(MsgBase^.GetMsgNum); MsgBase^.SeekFirst(MsgBase^.GetMsgNum);
SeekNextMsg(True, False); SeekNextMsg(True, False);
End; End;
Break; Break;
End; End;
'Q' : Begin 'Q' : Begin
GetMessageScan; GetMessageScan;
If MScan.NewScan = 2 Then If MScan.NewScan = 2 Then
Session.io.OutFullLn(Session.GetPrompt(302)) Session.io.OutFullLn(Session.GetPrompt(302))
Else Begin Else Begin
@ -2108,7 +2156,9 @@ Var
End; End;
'T' : Begin 'T' : Begin
Session.io.PromptInfo[1] := MBase.Name; Session.io.PromptInfo[1] := MBase.Name;
GetMessageScan; GetMessageScan;
Case MScan.NewScan of Case MScan.NewScan of
0 : Begin 0 : Begin
MScan.NewScan := 1; MScan.NewScan := 1;
@ -2128,12 +2178,14 @@ Var
'[' : If MsgBase^.GetRefer > 0 Then Begin '[' : If MsgBase^.GetRefer > 0 Then Begin
MsgBase^.SeekFirst(MsgBase^.GetRefer); MsgBase^.SeekFirst(MsgBase^.GetRefer);
MsgBase^.MsgStartUp; MsgBase^.MsgStartUp;
Break; Break;
End Else End Else
Session.io.OutFullLn (Session.GetPrompt(128)); Session.io.OutFullLn (Session.GetPrompt(128));
']' : If MsgBase^.GetSeeAlso > 0 Then Begin ']' : If MsgBase^.GetSeeAlso > 0 Then Begin
MsgBase^.SeekFirst(MsgBase^.GetSeeAlso); MsgBase^.SeekFirst(MsgBase^.GetSeeAlso);
MsgBase^.MsgStartUp; MsgBase^.MsgStartUp;
Break; Break;
End Else End Else
Session.io.OutFullLn (Session.GetPrompt(199)); Session.io.OutFullLn (Session.GetPrompt(199));
@ -2142,17 +2194,13 @@ Var
Until False; Until False;
End; End;
(**************************************************************************)
(**************************************************************************)
(**************************************************************************)
(**************************************************************************)
(**************************************************************************)
(**************************************************************************) (**************************************************************************)
(**************************************************************************) (**************************************************************************)
(**************************************************************************) (**************************************************************************)
{ F = Forward S = Search E = Electronic Mail { F = Forward S = Search E = Electronic Mail
N = New messages Y = Your messages G = Global scan N = New messages Y = Your messages G = Global scan
P = Global personal scan B = By You T = Global text search } P = Global personal scan B = By You T = Global text search }
Var Var
MsgNum : LongInt; MsgNum : LongInt;
Begin Begin
@ -2163,6 +2211,7 @@ Begin
If MBase.FileName = '' Then Begin If MBase.FileName = '' Then Begin
Session.io.OutFullLn (Session.GetPrompt(110)); Session.io.OutFullLn (Session.GetPrompt(110));
Exit; Exit;
End; End;
@ -2173,6 +2222,7 @@ Begin
If Not (Mode in ['B', 'T', 'S', 'E', 'F', 'G', 'N', 'P', 'Y']) Then Begin If Not (Mode in ['B', 'T', 'S', 'E', 'F', 'G', 'N', 'P', 'Y']) Then Begin
Session.io.OutFull (Session.GetPrompt(112)); Session.io.OutFull (Session.GetPrompt(112));
Mode := Session.io.OneKey('BFNSYQ', True); Mode := Session.io.OneKey('BFNSYQ', True);
End; End;
@ -2180,7 +2230,9 @@ Begin
'Q' : Exit; 'Q' : Exit;
'S' : If SearchStr = '' Then Begin 'S' : If SearchStr = '' Then Begin
Session.io.OutFull (Session.GetPrompt(396)); Session.io.OutFull (Session.GetPrompt(396));
SearchStr := Session.io.GetInput(50, 50, 12, ''); SearchStr := Session.io.GetInput(50, 50, 12, '');
If SearchStr = '' Then Exit; If SearchStr = '' Then Exit;
End; End;
End; End;
@ -2197,7 +2249,9 @@ Begin
Session.io.OutFullLn (Session.GetPrompt(124)) Session.io.OutFullLn (Session.GetPrompt(124))
Else Else
If Not (Mode in ['G', 'P', 'T']) Then Session.io.OutFullLn (Session.GetPrompt(114)); If Not (Mode in ['G', 'P', 'T']) Then Session.io.OutFullLn (Session.GetPrompt(114));
Dispose (MsgBase, Done); Dispose (MsgBase, Done);
Exit; Exit;
End; End;
@ -2220,7 +2274,9 @@ Begin
If Mode = 'F' Then Begin If Mode = 'F' Then Begin
Session.io.PromptInfo[1] := strI2S(MsgBase^.GetHighMsgNum); Session.io.PromptInfo[1] := strI2S(MsgBase^.GetHighMsgNum);
Session.io.OutFull (Session.GetPrompt(338)); Session.io.OutFull (Session.GetPrompt(338));
MsgNum := strS2I(Session.io.GetInput(6, 6, 12, '')); MsgNum := strS2I(Session.io.GetInput(6, 6, 12, ''));
End; End;
@ -2253,7 +2309,9 @@ Begin
If WereMsgs Then Begin If WereMsgs Then Begin
If Not (Mode in ['B', 'E', 'P']) And ReadRes Then If Not (Mode in ['B', 'E', 'P']) And ReadRes Then
If ListMode = 0 Then Begin If ListMode = 0 Then Begin
Session.io.OutFull('|CR'); Session.io.OutFull('|CR');
If Session.io.GetYN(Session.GetPrompt(383), False) Then If Session.io.GetYN(Session.GetPrompt(383), False) Then
PostMessage (False, ''); PostMessage (False, '');
End Else End Else
@ -2331,30 +2389,37 @@ Begin
If MBase.NetType = 3 Then Begin { NetMail Base: Get To *and* Address } If MBase.NetType = 3 Then Begin { NetMail Base: Get To *and* Address }
If MsgTo = '' Then Begin If MsgTo = '' Then Begin
Session.io.OutFull (Session.GetPrompt(119)); Session.io.OutFull (Session.GetPrompt(119));
MsgTo := Session.io.GetInput (30, 30, 18, ''); MsgTo := Session.io.GetInput (30, 30, 18, '');
End; End;
If MsgAddr = '' Then Begin If MsgAddr = '' Then Begin
Session.io.OutFull (Session.GetPrompt(342)); Session.io.OutFull (Session.GetPrompt(342));
MsgAddr := Session.io.GetInput (20, 20, 12, ''); MsgAddr := Session.io.GetInput (20, 20, 12, '');
If Not strStr2Addr(MsgAddr, DestAddr) Then MsgTo := ''; If Not strStr2Addr(MsgAddr, DestAddr) Then MsgTo := '';
End; End;
End Else End Else
If MBase.Flags and MBPrivate <> 0 Then Begin If MBase.Flags and MBPrivate <> 0 Then Begin
If MsgTo = '' Then Begin If MsgTo = '' Then Begin
Session.io.OutFull (Session.GetPrompt(450)); Session.io.OutFull (Session.GetPrompt(450));
MsgTo := Session.io.GetInput (30, 30, 18, ''); MsgTo := Session.io.GetInput (30, 30, 18, '');
If Not Session.User.SearchUser(MsgTo, MBase.Flags and MBRealNames <> 0) Then MsgTo := ''; If Not Session.User.SearchUser(MsgTo, MBase.Flags and MBRealNames <> 0) Then MsgTo := '';
End Else End Else
If strUpper(MsgTo) = 'SYSOP' Then MsgTo := Config.SysopName; If strUpper(MsgTo) = 'SYSOP' Then MsgTo := Config.SysopName;
If Session.User.FindUser(MsgTo, False) Then Begin If Session.User.FindUser(MsgTo, False) Then Begin
Session.io.PromptInfo[1] := MsgTo; Session.io.PromptInfo[1] := MsgTo;
Session.io.OutFullLn (Session.GetPrompt(108)); Session.io.OutFullLn (Session.GetPrompt(108));
End Else End Else
MsgTo := ''; MsgTo := '';
End Else Begin End Else Begin
Session.io.OutFull (Session.GetPrompt(119)); Session.io.OutFull (Session.GetPrompt(119));
MsgTo := Session.io.GetInput (30, 30, 18, 'All'); MsgTo := Session.io.GetInput (30, 30, 18, 'All');
End; End;
@ -2366,7 +2431,9 @@ Begin
If MsgSubj = '' Then If MsgSubj = '' Then
Repeat Repeat
Session.io.OutFull (Session.GetPrompt(120)); Session.io.OutFull (Session.GetPrompt(120));
MsgSubj := Session.io.GetInput (60, 60, 11, ''); MsgSubj := Session.io.GetInput (60, 60, 11, '');
If MsgSubj = '' Then If MsgSubj = '' Then
If Forced Then If Forced Then
Session.io.OutFull (Session.GetPrompt(307)) Session.io.OutFull (Session.GetPrompt(307))
@ -2407,6 +2474,7 @@ Begin
MsgBase^.SetKillSent (Config.netKillSent); MsgBase^.SetKillSent (Config.netKillSent);
DestAddr := Config.NetAddress[MBase.NetAddr]; DestAddr := Config.NetAddress[MBase.NetAddr];
MsgBase^.SetOrig (DestAddr); MsgBase^.SetOrig (DestAddr);
End; End;
@ -2514,7 +2582,9 @@ Begin
Session.io.OutFullLn (Session.GetPrompt(124)); Session.io.OutFullLn (Session.GetPrompt(124));
MsgBase^.CloseMsgBase; MsgBase^.CloseMsgBase;
Dispose (MsgBase, Done); Dispose (MsgBase, Done);
MBase := Old; MBase := Old;
End; End;
@ -2747,13 +2817,17 @@ Begin
OldUser := Session.User.ThisUser; OldUser := Session.User.ThisUser;
Reset (Session.User.UserFile); Reset (Session.User.UserFile);
While Not Eof(Session.User.UserFile) Do Begin While Not Eof(Session.User.UserFile) Do Begin
If (Session.User.ThisUser.Flags AND UserDeleted = 0) and Session.User.Access(ACS) Then Begin If (Session.User.ThisUser.Flags AND UserDeleted = 0) and Session.User.Access(ACS) Then Begin
Read (Session.User.UserFile, Session.User.ThisUser); Read (Session.User.UserFile, Session.User.ThisUser);
Session.io.PromptInfo[1] := Session.User.ThisUser.Handle; Session.io.PromptInfo[1] := Session.User.ThisUser.Handle;
Session.io.OutFullLn (Session.GetPrompt(392)); Session.io.OutFullLn (Session.GetPrompt(392));
End; End;
End; End;
Close (Session.User.UserFile); Close (Session.User.UserFile);
Session.User.ThisUser := OldUser; Session.User.ThisUser := OldUser;
@ -2769,7 +2843,9 @@ Begin
While NamePos < 25 Do Begin While NamePos < 25 Do Begin
Session.io.PromptInfo[1] := strI2S(NamePos); Session.io.PromptInfo[1] := strI2S(NamePos);
Session.io.OutFull (Session.GetPrompt(390)); Session.io.OutFull (Session.GetPrompt(390));
Str := Session.io.GetInput (30, 30, 18, ''); Str := Session.io.GetInput (30, 30, 18, '');
If Str <> '' Then Begin If Str <> '' Then Begin
If Session.User.SearchUser(Str, MBase.Flags And MBRealNames <> 0) Then Begin If Session.User.SearchUser(Str, MBase.Flags And MBRealNames <> 0) Then Begin
Inc (NamePos); Inc (NamePos);
@ -2843,8 +2919,10 @@ Begin
OldUser := Session.User.ThisUser; OldUser := Session.User.ThisUser;
Reset (Session.User.UserFile); Reset (Session.User.UserFile);
While Not Eof(Session.User.UserFile) Do Begin While Not Eof(Session.User.UserFile) Do Begin
Read (Session.User.UserFile, Session.User.ThisUser); Read (Session.User.UserFile, Session.User.ThisUser);
If (Session.User.ThisUser.Flags AND UserDeleted = 0) and Session.User.Access(ACS) Then Begin If (Session.User.ThisUser.Flags AND UserDeleted = 0) and Session.User.Access(ACS) Then Begin
MsgTo := Session.User.ThisUser.Handle; MsgTo := Session.User.ThisUser.Handle;
Session.User.ThisUser := OldUser; Session.User.ThisUser := OldUser;
@ -2854,6 +2932,7 @@ Begin
// rewritten.. probably do away with global MBAse records // rewritten.. probably do away with global MBAse records
End; End;
End; End;
Close (Session.User.UserFile); Close (Session.User.UserFile);
Session.User.ThisUser := OldUser; Session.User.ThisUser := OldUser;
@ -2913,10 +2992,13 @@ Begin
Reset (MBaseFile); Reset (MBaseFile);
Read (MBaseFile, MBase); {SKIP EMAIL BASE} Read (MBaseFile, MBase); {SKIP EMAIL BASE}
While Not Eof(MBaseFile) Do Begin While Not Eof(MBaseFile) Do Begin
Read (MBaseFile, MBase); Read (MBaseFile, MBase);
If Session.User.Access(MBase.ReadACS) Then Begin If Session.User.Access(MBase.ReadACS) Then Begin
GetMessageScan; GetMessageScan;
If MScan.QwkScan > 0 Then Begin If MScan.QwkScan > 0 Then Begin
Write (tFile, MBase.Index, CRLF); {conf #} Write (tFile, MBase.Index, CRLF); {conf #}
Write (tFile, MBase.QwkName, CRLF); {conf name} Write (tFile, MBase.QwkName, CRLF); {conf name}