MBonaldo/hfs2
1
0
Fork 0
mirror of https://github.com/rejetto/hfs2.git synced 2025-12-19 10:03:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

new 'public' section flag in place of 'private', inverting logic

Browse Source
This commit is contained in:
Massimo Melina 2020-06-16 00:35:15 +02:00
parent 6729be221a
commit efa99e7cbc
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classesLib.pas
View File

@ -139,7 +139,7 @@ type
PtplSection = ^TtplSection; PtplSection = ^TtplSection;
TtplSection = record TtplSection = record
name, txt: string; name, txt: string;
nolog, nourl, noList, cache: boolean; nolog, public, noList, cache: boolean;
ts: Tdatetime; ts: Tdatetime;
end; end;
@ -1020,8 +1020,8 @@ var
begin begin
if f='no log' then if f='no log' then
base.nolog:=TRUE base.nolog:=TRUE
else if f='private' then else if f='public' then
base.nourl:=TRUE base.public:=TRUE
else if f='no list' then else if f='no list' then
base.noList:=TRUE base.noList:=TRUE
else if f='cache' then else if f='cache' then
@ -1095,7 +1095,7 @@ var
begin // inherit from it begin // inherit from it
sect.txt:=from.txt+base.txt; sect.txt:=from.txt+base.txt;
sect.nolog:=from.nolog or base.nolog; sect.nolog:=from.nolog or base.nolog;
sect.nourl:=from.nourl or base.nourl; sect.public:=from.public or base.public;
sect.noList:=from.noList or base.noList; sect.noList:=from.noList or base.noList;
continue; continue;
end; end;

24
default.tpl
View File

File diff suppressed because one or more lines are too long

8
main.pas
View File

@ -1,4 +1,4 @@
{ {
Copyright (C) 2002-2020 Massimo Melina (www.rejetto.com) Copyright (C) 2002-2020 Massimo Melina (www.rejetto.com)
This file is part of HFS ~ HTTP File Server. This file is part of HFS ~ HTTP File Server.
@ -36,8 +36,8 @@ uses
HSlib, traylib, monoLib, progFrmLib, classesLib; HSlib, traylib, monoLib, progFrmLib, classesLib;
const const
VERSION = '2.4.0 RC4'; VERSION = '2.4.0 RC5';
VERSION_BUILD = '316'; VERSION_BUILD = '317';
VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF}; VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF};
CURRENT_VFS_FORMAT :integer = 1; CURRENT_VFS_FORMAT :integer = 1;
CRLF = #13#10; CRLF = #13#10;
@ -5615,7 +5615,7 @@ var
with tplFromFile(f) do // temporarily builds from diff tpls with tplFromFile(f) do // temporarily builds from diff tpls
try try
section:=getsection(s); section:=getsection(s);
if assigned(section) and not section.nourl then // it has to exist and be accessible if assigned(section) and section.public then // it has to exist and be accessible
begin begin
if not section.cache if not section.cache
or not notModified(conn, s+floatToStr(section.ts), '') then or not notModified(conn, s+floatToStr(section.ts), '') then