fix: [file.EXT] not working

rejetto · Jun 11, 2020 · f69251a · f69251a
1 parent 1f713f7
commit f69251a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/classesLib.pas b/classesLib.pas
@@ -956,7 +956,7 @@ function Ttpl.getTxt(section:string):string;
 end; // getTxt
 
 function Ttpl.getTxtByExt(fileExt:string):string;
-begin result:=getTxt('file.'+fileExt) end;
+begin result:=getTxt('file'+fileExt) end;
 
 procedure Ttpl.fromString(txt:string);
 var

diff --git a/main.pas b/main.pas
@@ -5609,8 +5609,7 @@ procedure Tmainfrm.httpEvent(event:ThttpEvent; conn:ThttpConn);
     s:='';
   if (s > '') and f.isFolder() and not ansiStartsText('special:', s) then
     with tplFromFile(f) do // temporarily builds from diff tpls
-      try
-        // NB: section [] is not accessible, because of the s>'' test
+      try 
         section:=getsection(s);
         if assigned(section) and not section.nourl then // it has to exist and be accessible 
           begin
@@ -5619,7 +5618,8 @@ procedure Tmainfrm.httpEvent(event:ThttpEvent; conn:ThttpConn);
             getPage(s, data, f, me());
           exit;
           end;
-      finally free end;
+      finally free 
+        end;
 
   if f.isFolder() and not (FA_BROWSABLE in f.flags)
   and stringExists(urlCmd,['','~folder.tar','~files.lst']) then

diff --git a/scriptLib.pas b/scriptLib.pas
@@ -1932,7 +1932,7 @@ function cbMacros(fullMacro:string; pars:Tstrings; cbData:pointer):string;
       disconnect();
 
     if name = 'stop server' then
--      begin
+      begin
       stopServer();
       exit('');
       end;