Skip to content

Commit e0100cc

Browse files
jianboyjianboy
committed
update to VER 2.3m
1 parent 40c7370 commit e0100cc

11 files changed

+114
-58
lines changed

‎src/data.RES

220 Bytes
Binary file not shown.

‎src/default.tpl

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ COMMENT with these you can disable some features of the template. Please note th
4848
[list]
4949
<div id='files_outer'>
5050
<div style='height:1.6em;'></div> {.comment| this is quite ugly, i know, but if i use any vertical padding with height:100% i'll get a scrollbar .}
51-
{.if not| %number% |{: <div style='font-size:200%; padding:1em;'>{.!No {.if|{.length|{.?search.}.}|results|files.}.}</div> :}|{:
51+
{.if not| %number% |{: <div style='font-size:200%; padding:1em;'>{.!{.if|{.length|{.?search.}.}|No results|No files.}.}</div> :}|{:
5252
<form method='post'>
5353
<table id='files'>
5454
{.set|sortlink| {:<a href="{.trim|
@@ -93,7 +93,7 @@ COMMENT with these you can disable some features of the template. Please note th
9393
<button onclick='changePwd.call(this)' style='font-size:x-small;'>{.!Change password.}</button>
9494
.}
9595
:}
96-
| <a href="~login">Login</a>
96+
| <a href="~login">{.!Login.}</a>
9797
.}
9898
</center>
9999
</fieldset>
@@ -155,7 +155,7 @@ COMMENT with these you can disable some features of the template. Please note th
155155
selectedChanged();
156156
">{.!Invert.}</button>
157157
<button onclick='selectionMask.call(this)'>{.!Mask.}</button>
158-
<p style='display:none; margin-top:1em;'><span id='selected-number'>0</span> items selected</p>
158+
<p style='display:none; margin-top:1em;'><span id='selected-number'>0</span> {.!items selected.}</p>
159159
</center>
160160
</fieldset>
161161

@@ -270,7 +270,7 @@ fieldset { margin-bottom:0.7em; text-align:left; padding:0.6em; }
270270
<td>%item-size%B<td>%item-modified%<td>%item-dl-count%
271271

272272
[+folder]
273-
<td class='nosize'>folder<td>%item-modified%<td>%item-dl-count%
273+
<td class='nosize'>{.!folder-item|folder.}<td>%item-modified%<td>%item-dl-count%
274274

275275
[+link]
276276
<td class='nosize'>link<td colspan='2'>
@@ -377,7 +377,7 @@ fieldset { margin-bottom:0.7em; text-align:left; padding:0.6em; }
377377

378378
[progress-upload-file]
379379
{.if not|{.{.?only.} = down.}|{:
380-
<li> Uploading %total% @ %speed-kb% KB/s
380+
<li> {.!Uploading.} %total% @ %speed-kb% KB/s
381381
<br /><span class='fn'>%filename%</span>
382382
<br />{.!Time left.} %time-left%"
383383
<br /><div class='out_bar'><div class='in_bar' style="width:%perc%px"></div></div> %perc%%
@@ -465,7 +465,7 @@ can change pwd=member of|can change password
465465
can move=or|1|1
466466
escape attr=replace|"|&quot;|$1
467467
commentNL=if|{.pos|<br|$1.}|$1|{.replace|{.chr|10.}|<br />|$1.}
468-
add bytes=switch|{.cut|-1||$1.}|,|0,1,2,3,4,5,6,7,8,9|$1 Bytes|K,M,G,T|$1Bytes
468+
add bytes=switch|{.cut|-1||$1.}|,|0,1,2,3,4,5,6,7,8,9|$1 {.!Bytes.}|K,M,G,T|$1{.!Bytes.}
469469

470470
[special:import]
471471
{.new account|can change password|enabled=1|is group=1|notes=accounts members of this group will be allowed to change their password.}
@@ -516,7 +516,7 @@ $(function(){
516516
if (!$("[name=file]").val()) return false; // no file, no submit
517517
$(this).hide(); // we don't need the form anymore, make space for the progress bars
518518
// build the gui
519-
x.append("<div id='progress'>in progress...</div>");
519+
x.append("<div id='progress'>{.!in progress....}</div>");
520520
x.append($("<button style='float:right'>{.!Cancel.}</button>").click(function(){
521521
// stop submit/upload
522522
if (typeof stop == 'function')

‎src/hfs.bdsproj

+5
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@
171171
<VersionInfoKeys Name="ProductVersion">2.3</VersionInfoKeys>
172172
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
173173
</VersionInfoKeys>
174+
175+
176+
177+
178+
174179
<Excluded_Packages>
175180
<Excluded_Packages Name="c:\programmi\borland\bds\4.0\Bin\dclsoap100.bpl">Borland SOAP Components</Excluded_Packages>
176181
<Excluded_Packages Name="c:\programmi\borland\bds\4.0\Bin\dclie100.bpl">Internet Explorer Components</Excluded_Packages>

‎src/hfs.dpr

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ uses
3232
types,
3333
hslib,
3434
sysUtils,
35+
uFreeLocalizer,
3536
main in 'main.pas' {mainFrm},
3637
newuserpassDlg in 'newuserpassDlg.pas' {newuserpassFrm},
3738
optionsDlg in 'optionsDlg.pas' {optionsFrm},
@@ -94,6 +95,10 @@ begin
9495
end;
9596
{$IFDEF EX_DEBUG}initErrorHandler(format('HFS %s (%s)', [VERSION, VERSION_BUILD]));{$ENDIF}
9697
Application.Initialize();
98+
99+
FreeLocalizer.AutoTranslate := True;
100+
FreeLocalizer.LanguageFile := 'hfs.lng';
101+
97102
Application.CreateForm(TmainFrm, mainFrm);
98103
Application.CreateForm(TnewuserpassFrm, newuserpassFrm);
99104
Application.CreateForm(ToptionsFrm, optionsFrm);

‎src/hfs.res

0 Bytes
Binary file not shown.

‎src/hfs.tpl

+15-16
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ COMMENT with these you can disable some features of the template. Please note th
4848
[list]
4949
<div id='files_outer'>
5050
<div style='height:1.6em;'></div> {.comment| this is quite ugly, i know, but if i use any vertical padding with height:100% i'll get a scrollbar .}
51-
{.if not| %number% |{: <div style='font-size:200%; padding:1em;'>{.!No {.if|{.length|{.?search.}.}|results|files.}.}</div> :}|{:
51+
{.if not| %number% |{: <div style='font-size:200%; padding:1em;'>{.!{.if|{.length|{.?search.}.}|No results|No files.}.}</div> :}|{:
5252
<form method='post'>
5353
<table id='files'>
5454
{.set|sortlink| {:<a href="{.trim|
@@ -93,7 +93,7 @@ COMMENT with these you can disable some features of the template. Please note th
9393
<button onclick='changePwd.call(this)' style='font-size:x-small;'>{.!Change password.}</button>
9494
.}
9595
:}
96-
| <a href="~login">Login</a>
96+
| <a href="~login">{.!Login.}</a>
9797
.}
9898
</center>
9999
</fieldset>
@@ -155,7 +155,7 @@ COMMENT with these you can disable some features of the template. Please note th
155155
selectedChanged();
156156
">{.!Invert.}</button>
157157
<button onclick='selectionMask.call(this)'>{.!Mask.}</button>
158-
<p style='display:none; margin-top:1em;'><span id='selected-number'>0</span> items selected</p>
158+
<p style='display:none; margin-top:1em;'><span id='selected-number'>0</span> {.!items selected.}</p>
159159
</center>
160160
</fieldset>
161161

@@ -270,7 +270,7 @@ fieldset { margin-bottom:0.7em; text-align:left; padding:0.6em; }
270270
<td>%item-size%B<td>%item-modified%<td>%item-dl-count%
271271

272272
[+folder]
273-
<td class='nosize'>folder<td>%item-modified%<td>%item-dl-count%
273+
<td class='nosize'>{.!folder.}<td>%item-modified%<td>%item-dl-count%
274274

275275
[+link]
276276
<td class='nosize'>link<td colspan='2'>
@@ -377,7 +377,7 @@ fieldset { margin-bottom:0.7em; text-align:left; padding:0.6em; }
377377

378378
[progress-upload-file]
379379
{.if not|{.{.?only.} = down.}|{:
380-
<li> Uploading %total% @ %speed-kb% KB/s
380+
<li> {.!Uploading.} %total% @ %speed-kb% KB/s
381381
<br /><span class='fn'>%filename%</span>
382382
<br />{.!Time left.} %time-left%"
383383
<br /><div class='out_bar'><div class='in_bar' style="width:%perc%px"></div></div> %perc%%
@@ -446,8 +446,8 @@ fieldset { margin-bottom:0.7em; text-align:left; padding:0.6em; }
446446
{.check session.}
447447
{.break|if={.not|{.can comment.}.} |result=forbidden.}
448448
{.for each|fn|{.replace|:|{.no pipe||.}|{.postvar|files.}.}|{:
449-
{.break|if={.is file protected|var=fn.}|result=forbidden.}
450-
{.set item|{.force ansi|%folder%{.^fn.}.}|comment={.encode html|{.force ansi|{.postvar|text.}.}.}.}
449+
{.break|if={.is file protected|var=fn.}|result=forbidden.}
450+
{.set item|{.force ansi|%folder%{.^fn.}.}|comment={.encode html|{.force ansi|{.postvar|text.}.}.}.}
451451
:}.}
452452
{.pipe|ok.}
453453

@@ -465,8 +465,7 @@ can change pwd=member of|can change password
465465
can move=or|1|1
466466
escape attr=replace|"|&quot;|$1
467467
commentNL=if|{.pos|<br|$1.}|$1|{.replace|{.chr|10.}|<br />|$1.}
468-
add bytes=switch|{.cut|-1||$1.}|,|0,1,2,3,4,5,6,7,8,9|$1 Bytes|K,M,G,T|$1Bytes
469-
quote={:"$1":}
468+
add bytes=switch|{.cut|-1||$1.}|,|0,1,2,3,4,5,6,7,8,9|$1 {.!Bytes.}|K,M,G,T|$1{.!Bytes.}
470469

471470
[special:import]
472471
{.new account|can change password|enabled=1|is group=1|notes=accounts members of this group will be allowed to change their password.}
@@ -517,7 +516,7 @@ $(function(){
517516
if (!$("[name=file]").val()) return false; // no file, no submit
518517
$(this).hide(); // we don't need the form anymore, make space for the progress bars
519518
// build the gui
520-
x.append("<div id='progress'>in progress...</div>");
519+
x.append("<div id='progress'>{.!in progress....}</div>");
521520
x.append($("<button style='float:right'>{.!Cancel.}</button>").click(function(){
522521
// stop submit/upload
523522
if (typeof stop == 'function')
@@ -674,7 +673,7 @@ function selectedChanged() {
674673
function getItemName(el) {
675674
if (typeof el == 'undefined')
676675
return false;
677-
// we handle elements, not jquery sets
676+
// we handle elements, not jquery sets
678677
if (el.jquery)
679678
if (el.size())
680679
el = el[0];
@@ -749,7 +748,7 @@ function ezprompt(msg, options, cb) {
749748
}
750749
if (!$.prompt) { // load on demand
751750
include('/?mode=section&id=impromptu.css');
752-
include('/?mode=section&id=jquery.impromptu.js');
751+
include('/?mode=section&id=jquery.impromptu.js');
753752
}
754753
var v;
755754
if (v = options.type) {
@@ -764,17 +763,17 @@ function ezprompt(msg, options, cb) {
764763
$.prompt(msg, {
765764
opacity: 0.9,
766765
overlayspeed: 'fast',
767-
loaded: function(){
766+
loaded: function(){
768767
$('#jqibox').find(':input').keypress(function (e) {
769768
var c = (e.keyCode || e.which);
770769
if (options.keypress && options.keypress(c, this, e) === false) return;
771770
if (c != 13 || this.tagName == 'TEXTAREA') return; // ENTER key is like submit, but not in textarea
772771
$('.jqibuttons button:first').click();
773772
return false;
774-
}).filter(':first').focus()[0].select();
773+
}).filter(':first').focus()[0].select();
775774
},
776775
submit: function(val,div,form) {
777-
var res = cb(options.type ? form.txt : form, $('#jqibox'), options.cbData );
776+
var res = cb(options.type ? $.trim(form.txt) : form, $('#jqibox'), options.cbData );
778777
if (res === false) {
779778
$('#jqibox').find(':input:first').focus();
780779
return false;
@@ -919,7 +918,7 @@ function delCookie(name) {
919918
setCookie(name,"",-1);
920919
} // delCookie
921920
922-
921+
923922
[jquery.impromptu.js|no log]
924923
/*
925924
* jQuery Impromptu

‎src/hslib.pas

+55-25
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ ThttpConn = class
206206
constructor create(server:ThttpSrv);
207207
destructor Destroy; override;
208208
procedure disconnect();
209-
procedure addHeader(s:string; overwrite:boolean=TRUE); // append an additional header line
209+
procedure addHeader(s:string; overwrite:boolean=TRUE); // set an additional header line. If overwrite=false will always append.
210+
function setHeaderIfNone(s:string):boolean; // set header if not already existing
211+
procedure removeHeader(name:string);
210212
function getHeader(h:string):string; // extract the value associated to the specified header field
211213
function getCookie(k:string):string;
212214
procedure setCookie(k, v:string; pairs:array of string; extra:string='');
@@ -1518,7 +1520,8 @@ procedure ThttpConn.tryNotify(ev:ThttpEvent);
15181520
procedure ThttpConn.sendheader(h:string='');
15191521
begin
15201522
state:=HCS_REPLYING_HEADER;
1521-
if reply.header = '' then reply.header:=h;
1523+
if reply.header = '' then
1524+
reply.header:=h;
15221525
includeTrailingString(reply.header, CRLF);
15231526
reply.header:=reply.header+reply.additionalHeaders;
15241527
includeTrailingString(reply.header, CRLF);
@@ -1555,32 +1558,59 @@ function ThttpConn.replyHeader_code(code:integer):string;
15551558
function ThttpConn.replyHeader_mode(mode:ThttpReplyMode):string;
15561559
begin result:=replyHeader_code(HRM2CODE[mode]) end;
15571560

1558-
procedure ThttpConn.addHeader(s:string; overwrite:boolean=TRUE);
1561+
function getNameOf(s:string):string; // colon included
1562+
begin result:=copy(s, 1, pos(':', s)) end;
1563+
1564+
// return 0 if not found
1565+
function namePos(name:string; headers:string; from:integer=1):integer;
1566+
begin
1567+
result:=from;
1568+
repeat
1569+
result:=ipos(name, headers, result);
1570+
until (result<=1) // both not found and found at the start of the string
1571+
or (headers[result-1] = #10) // or start of the line
1572+
end; // namePos
1573+
1574+
// return true if the operation succeded
1575+
function ThttpConn.setHeaderIfNone(s:string):boolean;
15591576
var
1560-
i, j, from: integer;
1561-
name, was: string;
1577+
name: string;
1578+
begin
1579+
name:=getNameOf(s);
1580+
if name = '' then
1581+
raise Exception.Create('Missing colon');
1582+
result:=namePos(name, reply.additionalHeaders) = 0; // empty text will also be considered as existing
1583+
if result then
1584+
addHeader(s, FALSE); // with FALSE it's faster
1585+
end; // setHeaderIfNone
1586+
1587+
procedure ThttpConn.removeHeader(name:string);
1588+
var
1589+
i, eol: integer;
1590+
s: string;
1591+
begin
1592+
s:=reply.additionalHeaders;
1593+
includeTrailingString(name,':');
1594+
// see if it already exists
1595+
i:=1;
1596+
repeat
1597+
i:=namePos(name, s, i);
1598+
if i = 0 then break;
1599+
// yes it does
1600+
eol:=posEx(#10, s, i);
1601+
if eol = 0 then // this never happens, unless the string is corrupted. Just to be sounder.
1602+
eol:=length(s);
1603+
delete(s, i, eol-i+1); // remove it
1604+
until false;
1605+
reply.additionalHeaders:=s;
1606+
end; // removeHeader
1607+
1608+
procedure ThttpConn.addHeader(s:string; overwrite:boolean=TRUE);
15621609
begin
1563-
was:=reply.additionalHeaders; // handy shortcut
15641610
if overwrite then
1565-
begin
1566-
// calculate the matching text
1567-
i:=pos(':', s);
1568-
if i = 0 then
1569-
i:=length(s);
1570-
name:=copy(s, 1, i);
1571-
// see if it already exists
1572-
from:=1;
1573-
repeat
1574-
i:=ipos(name, was, from);
1575-
if (i=0) or (i>1) and (was[i-1] <> #10) then break;
1576-
// yes it does
1577-
j:=posEx(#10, was, i)+1;
1578-
delete(was, i, j-i); // remove it
1579-
from:=i;
1580-
until false;
1581-
end;
1582-
reply.additionalHeaders:=was+s+CRLF;
1583-
end;
1611+
removeHeader(getNameOf(s));
1612+
appendStr(reply.additionalHeaders, s+CRLF);
1613+
end; // addHeader
15841614

15851615
function ThttpConn.getDontFree():boolean;
15861616
begin result:=lockCount > 0 end;

‎src/main.pas

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ interface
3535
HSlib, traylib, monoLib, progFrmLib, classesLib;
3636

3737
const
38-
VERSION = '2.3k';
39-
VERSION_BUILD = '299';
38+
VERSION = '2.3m';
39+
VERSION_BUILD = '300';
4040
VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF};
4141
CURRENT_VFS_FORMAT :integer = 1;
4242
CRLF = #13#10;
@@ -311,7 +311,7 @@ TconnData = class // data associated to a client connection
311311
downloadingWhat: TdownloadingWhat;
312312
preReply: TpreReply;
313313
banReason: string;
314-
lastBytesSent, lastBytesGot: int64; // used for print to log only the recent amount of bytes
314+
lastBytesSent, lastBytesGot: int64; // used for print to log only the recent amount of bytes
315315
lastActivityTime, fileXferStart: Tdatetime;
316316
uploadSrc, uploadDest: string;
317317
uploadFailed: string; // reason (empty on success)
@@ -5387,13 +5387,12 @@ procedure Tmainfrm.httpEvent(event:ThttpEvent; conn:ThttpConn);
53875387
exit;
53885388
end;
53895389

5390+
if notModified(conn, f) then // calling notModified before limitsExceededOnDownload makes possible for [download] to manipualate headers set here
5391+
exit;
53905392
data.countAsDownload:=f.shouldCountAsDownload();
53915393
if data.countAsDownload and limitsExceededOnDownload() then
53925394
exit;
53935395

5394-
if notModified(conn, f) then
5395-
exit;
5396-
53975396
setupDownloadIcon(data);
53985397
data.eta.idx:=0;
53995398
conn.reply.contentType:=name2mimetype(f.name, DEFAULT_MIME);
@@ -10668,6 +10667,7 @@ procedure Tmainfrm.compressReply(cd:TconnData);
1066810667
s:=ZcompressStr2(s, zcFastest, 31,8,zsDefault);
1066910668
if (cd.workaroundForIEutf8 = yes) and (length(s) < BAD_IE_THRESHOLD) then exit;
1067010669
cd.conn.addHeader('Content-Encoding: gzip');
10670+
cd.conn.addHeader('Content-Length: '+intToStr(length(s)));
1067110671
cd.conn.reply.body:=s;
1067210672
end; // compressReply
1067310673

‎src/scriptLib.pas

+8-1
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,14 @@ function cbMacros(fullMacro:string; pars:Tstrings; cbData:pointer):string;
22782278
url:=trim(substr(p, ':'))
22792279
end
22802280
else
2281-
md.cd.conn.addHeader(p);
2281+
md.cd.conn.addHeader(p, isTrue(par('overwrite',true,'1')));
2282+
end;
2283+
2284+
if name = 'remove header' then
2285+
if satisfied(md.cd) then
2286+
begin
2287+
result:='';
2288+
md.cd.conn.removeHeader(p);
22822289
end;
22832290

22842291
if name = 'get ini' then

‎src/utillib.pas

+3-3
Original file line numberDiff line numberDiff line change
@@ -941,13 +941,13 @@ function loadFile(fn:string; from:int64=0; size:int64=-1):ansistring;
941941
try
942942
reset(f,1);
943943
if IOresult <> 0 then exit;
944-
seek(f, from);
945-
if size < 0 then
944+
if (size < 0) or (size > filesize(f)-from) then
946945
size:=filesize(f)-from;
947946
setLength(result, size);
947+
seek(f, from);
948948
blockRead(f, result[1], size);
949-
closeFile(f);
950949
finally
950+
closeFile(f);
951951
filemode:=bak;
952952
end;
953953
end; // loadFile

0 commit comments

Comments
 (0)