eric
/
mysticbbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Std file list fix, viewing archive inside of archive

This commit is contained in:
mysticbbs 2013-02-22 20:46:23 -05:00
parent 201ffd37be
commit 62cb7ed210
1 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
mystic/bbs_filebase.pas
View File

@ -949,20 +949,22 @@ Begin
If Mask <> '' Then Begin If Mask <> '' Then Begin
ExecuteArchive (FName, '', Mask, 2); ExecuteArchive (FName, '', Mask, 2);
Session.io.PromptInfo[1] := Mask; If Not ArchiveList(Session.TempPath + Mask) Then Begin
Session.io.PromptInfo[1] := Mask;
Session.io.OutFullLn(Session.GetPrompt(306)); Session.io.OutFullLn(Session.GetPrompt(306));
Session.io.AllowMCI := False; Session.io.AllowMCI := False;
Session.io.OutFile (Session.TempPath + Mask, True, 0); Session.io.OutFile (Session.TempPath + Mask, True, 0);
Session.io.AllowMCI := True; Session.io.AllowMCI := True;
If Session.io.NoFile Then If Session.io.NoFile Then
Session.io.OutFullLn (Session.GetPrompt(305)) Session.io.OutFullLn (Session.GetPrompt(305));
Else End;
FileErase(Session.TempPath + Mask);
FileErase(Session.TempPath + Mask);
End; End;
End; End;
End; End;
@ -2247,7 +2249,7 @@ Var
B : Integer; B : Integer;
Begin Begin
Session.io.AllowArrow := True; Session.io.AllowArrow := True;
ListType := 1; ListType := 1;
strListFormat := Session.GetPrompt(431); strListFormat := Session.GetPrompt(431);
strBarON := Session.GetPrompt(432); strBarON := Session.GetPrompt(432);
@ -2479,6 +2481,10 @@ Var
End; End;
'P' : Begin 'P' : Begin
PrevPage; PrevPage;
If CurPage = 1 Then
TopDesc := 0;
DrawPage; DrawPage;
End; End;
'Q' : Begin 'Q' : Begin
@ -2724,19 +2730,21 @@ End;
Procedure TFileBase.UploadFile; Procedure TFileBase.UploadFile;
Var Var
FileName : String; FileName : String;
A : LongInt; A : LongInt;
D : DirStr; OLD : RecFileBase;
N : NameStr; Blind : Boolean;
E : ExtStr; Temp : String;
OLD : RecFileBase; FullName : String;
Blind : Boolean; DataFile : File;
Temp : String; Found : Boolean;
FullName : String; LogFile : Text;
DataFile : File;
Found : Boolean;
LogFile : Text;
FileStatus : Boolean; FileStatus : Boolean;
{$IFNDEF UNIX}
D : DirStr;
N : NameStr;
E : ExtStr;
{$ENDIF}
Begin Begin
OLD := FBase; OLD := FBase;
Found := False; Found := False;
@ -2775,15 +2783,21 @@ Begin
End; End;
If Config.FreeUL > 0 Then Begin If Config.FreeUL > 0 Then Begin
FSplit (FBase.Path, D, N, E); {$IFDEF UNIX}
If DiskFree(0) DIV 1024 < Config.FreeUL Then Begin
Session.io.OutFullLn (Session.GetPrompt(81));
FBase := OLD;
Exit;
End;
{$ELSE}
FSplit (FBase.Path, D, N, E);
// this might be broken? If DiskFree(Ord(UpCase(D[1])) - 64) DIV 1024 < Config.FreeUL Then Begin
Session.io.OutFullLn (Session.GetPrompt(81));
If DiskFree(Ord(UpCase(D[1])) - 64) DIV 1024 < Config.FreeUL Then Begin FBase := OLD;
Session.io.OutFullLn (Session.GetPrompt(81)); Exit;
FBase := OLD; End;
Exit; {$ENDIF}
End;
End; End;
Blind := Session.io.GetYN(Session.GetPrompt(375), False); Blind := Session.io.GetYN(Session.GetPrompt(375), False);