diff --git a/classesLib.pas b/classesLib.pas
index baeaee1..978852d 100644
--- a/classesLib.pas
+++ b/classesLib.pas
@@ -39,7 +39,7 @@ type
PcachedIcon = ^TcachedIcon;
TcachedIcon = record
- data: ansistring;
+ data: string;
idx: integer;
time: Tdatetime;
end;
@@ -47,11 +47,11 @@ type
TiconsCache = class
n: integer;
icons: array of TcachedIcon;
- function get(data:ansistring):PcachedIcon;
- procedure put(data:ansistring; idx:integer; time:Tdatetime);
+ function get(data:string):PcachedIcon;
+ procedure put(data:string; idx:integer; time:Tdatetime);
procedure clear();
procedure purge(olderThan:Tdatetime);
- function idxOf(data:shortstring):integer;
+ function idxOf(data:string):integer;
end;
TusersInVFS = class
@@ -105,7 +105,7 @@ type
function fsInit():boolean;
procedure headerInit(); // fill block with header
procedure padInit(full:boolean=FALSE); // fill block with pad
- function headerLengthForFilename(fn:ansistring):integer;
+ function headerLengthForFilename(ufn:string):integer;
procedure calculate(); override;
public
fileNamesOEM: boolean;
@@ -316,7 +316,7 @@ end; // match
//////////// TiconsCache
-function TiconsCache.idxOf(data:shortstring):integer;
+function TiconsCache.idxOf(data:string):integer;
var
b, e, c: integer;
begin
@@ -335,7 +335,7 @@ e:=n-1;
result:=b;
end; // idxOf
-function TiconsCache.get(data:ansistring):PcachedIcon;
+function TiconsCache.get(data:string):PcachedIcon;
var
i: integer;
begin
@@ -345,7 +345,7 @@ if (i >= 0) and (i < n) and (icons[i].data = data) then
result:=@icons[i];
end; // get
-procedure TiconsCache.put(data:ansistring; idx:integer; time:Tdatetime);
+procedure TiconsCache.put(data:string; idx:integer; time:Tdatetime);
var
i, w: integer;
begin
@@ -569,7 +569,7 @@ var
begin
ufn:=replaceStr(flist[cur].dst,'\','/');
if fileNamesOEM then
- CharToOem(pWideChar(ufn), pAnsiChar(fn))
+ fn:=strToOem(ufn)
else
fn:=UTF8encode(ufn);
pre:='';
@@ -612,8 +612,14 @@ block.WriteString(dupeString(#0, if_(full,512,gap512(pos)) ));
block.Seek(0, soBeginning);
end; // padInit
-function TtarStream.headerLengthForFilename(fn:ansistring):integer;
+function TtarStream.headerLengthForFilename(ufn:string):integer;
+var
+ fn: ansistring;
begin
+if fileNamesOEM then
+ fn:=strToOem(ufn)
+else
+ fn:=UTF8encode(ufn);
result:=length(fn);
result:=512*if_(result<100, 1, 3+result div 512);
end; // headerLengthForFilename
diff --git a/filepropDlg.pas b/filepropDlg.pas
index fd61f0e..b574986 100644
--- a/filepropDlg.pas
+++ b/filepropDlg.pas
@@ -160,7 +160,7 @@ end;
procedure TfilepropFrm.FormKeyPress(Sender: TObject; var Key: Char);
begin
if pages.focused then
- if key in ['1'..'9'] then
+ if charInSet(key, ['1'..'9']) then
try pages.TabIndex:=ord(key)-ord('0')-1
except end;
end;
diff --git a/hslib.pas b/hslib.pas
index fa622c3..473b587 100644
--- a/hslib.pas
+++ b/hslib.pas
@@ -29,7 +29,7 @@ unit HSlib;
interface
uses
- OverbyteIcsWSocket, classes, messages, winprocs, forms, extctrls, sysutils, contnrs, strUtils, winsock, inifiles, types;
+ OverbyteIcsWSocket, classes, messages, winprocs, forms, extctrls, sysutils, system.contnrs, strUtils, winsock, inifiles, types;
const
VERSION = '2.11.0';
@@ -105,9 +105,9 @@ type
bodyFile: string;
bodyStream: Tstream; // note: the stream is automatically freed
firstByte, lastByte: int64; // body interval for partial replies (206)
- realm: ansistring; // this will appear in the authentication dialog
- url: ansistring; // used for redirections
- reason: ansistring; // customized reason phrase
+ realm, // this will appear in the authentication dialog
+ reason, // customized reason phrase
+ url: string; // used for redirections
resumeForbidden: boolean;
end;
@@ -208,9 +208,10 @@ type
destructor Destroy; override;
procedure disconnect();
procedure addHeader(s:ansistring; overwrite:boolean=TRUE); // set an additional header line. If overwrite=false will always append.
- function setHeaderIfNone(s:string):boolean; // set header if not already existing
+ function setHeaderIfNone(s:ansistring):boolean; // set header if not already existing
procedure removeHeader(name:ansistring);
- function getHeader(h:string):string; // extract the value associated to the specified header field
+ function getHeader(h:ansistring):string; // extract the value associated to the specified header field
+ function getHeaderA(h:ansistring):ansistring; // extract the value associated to the specified header field
function getCookie(k:string):string;
procedure setCookie(k, v:string; pairs:array of string; extra:string='');
procedure delCookie(k:string);
@@ -310,7 +311,7 @@ function chopLine(var s:string):string; overload;
// decode/decode url
function decodeURL(url:ansistring; utf8:boolean=TRUE):string;
function encodeURL(url:string; nonascii:boolean=TRUE; spaces:boolean=TRUE;
- unicode:boolean=FALSE):string;
+ htmlEncoding:boolean=FALSE):string;
// returns true if address is not suitable for the internet
function isLocalIP(ip:string):boolean;
// base64 encoding
@@ -330,7 +331,7 @@ function ipos(ss, s:string; ofs:integer=1):integer; overload;
implementation
uses
- Windows;
+ Windows, ansistrings;
const
CRLF = #13#10;
MAX_REQUEST_LENGTH = 64*1024;
@@ -477,6 +478,15 @@ else
end; // base64encode
function base64decode(s:ansistring):ansistring;
+
+ function if_(cond:boolean; c:ansichar):ansistring;
+ begin
+ if cond then
+ result:=c
+ else
+ result:=''
+ end;
+
const
TABLE:array[#43..#122] of byte=(
62,0,0,0,63,52,53,54,55,56,57,58,59,60,61,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,
@@ -484,15 +494,18 @@ const
29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51);
var
i: integer;
+ p1, p2: byte;
begin
result:='';
i:=1;
while i <= length(s) do
begin
+ p1:=TABLE[s[i+1]];
+ p2:=TABLE[s[i+2]];
result:=result
- +ansichar(TABLE[s[i]] shl 2+TABLE[s[i+1]] shr 4)
- +ifThen(s[i+2]<>'=', ansichar(TABLE[s[i+1]] shl 4+TABLE[s[i+2]] shr 2))
- +ifThen(s[i+3]<>'=', ansichar(TABLE[s[i+2]] shl 6+TABLE[s[i+3]]));
+ +ansichar(TABLE[s[i]] shl 2+p1 shr 4)
+ +if_(s[i+2]<>'=', ansichar(p1 shl 4+p2 shr 2))
+ +if_(s[i+3]<>'=', ansichar(p2 shl 6+TABLE[s[i+3]]));
inc(i,4);
end;
end; // base64decode
@@ -527,24 +540,25 @@ else
end; // decodeURL
function encodeURL(url:string; nonascii:boolean=TRUE; spaces:boolean=TRUE;
- unicode:boolean=FALSE):string;
+ htmlEncoding:boolean=FALSE):string;
var
i: integer;
- encodePerc, encodeUni: set of char;
+ encodePerc, encodeHTML: set of char;
a: ansistring;
begin
result:='';
if url = '' then
exit;
-encodeUni:=[];
-if nonascii then encodeUni:=[#128..#255];
+encodeHTML:=[];
+if nonascii then
+ encodeHTML:=[#128..#255];
encodePerc:=[#0..#31,'#','%','?','"','''','&','<','>',':'];
// actually ':' needs encoding only in relative url
if spaces then include(encodePerc,' ');
-if not unicode then
+if not htmlEncoding then
begin
- encodePerc:=encodePerc+encodeUni;
- encodeUni:=[];
+ encodePerc:=encodePerc+encodeHTML;
+ encodeHTML:=[];
end;
if nonascii then
begin
@@ -557,7 +571,7 @@ if nonascii then
for i:=1 to length(url) do
if charInSet(url[i], encodePerc) then
result:=result+'%'+intToHex(ord(url[i]),2)
- else if charInSet(url[i], encodeUni) then
+ else if charInSet(url[i], encodeHTML) then
result:=result+'&#'+intToStr(charToUnicode(url[i]))+';'
else
result:=result+url[i];
@@ -583,7 +597,8 @@ end; // getIP
function replyHeader_IntPositive(name:ansistring; int:int64):ansistring;
begin
result:='';
-if int >= 0 then result:=name+': '+intToStr(int)+CRLF;
+if int >= 0 then
+ result:=name+': '+ansistring(intToStr(int))+CRLF;
end;
function replyHeader_Str(name:ansistring; str:ansistring):ansistring;
@@ -993,13 +1008,20 @@ state:=HCS_DISCONNECTED;
srv.disconnecting.Add(self);
end;
-function ThttpConn.getHeader(h:string):string;
+function ThttpConn.getHeader(h:ansistring):string;
begin
result:='';
-if request.method = HM_UNK then exit;
-result:=trim(request.headers.values[h]);
+if request.method <> HM_UNK then
+ result:=trim(UTF8toString(rawByteString(request.headers.values[h])));
end; // getHeader
+function ThttpConn.getHeaderA(h:ansistring):ansistring;
+begin
+result:='';
+if request.method <> HM_UNK then
+ result:=ansistrings.trim(ansistring(request.headers.values[h]));
+end; // getHeaderA
+
function ThttpConn.getBuffer():ansistring;
begin result:=buffer end;
@@ -1031,7 +1053,7 @@ while i < length(pairs)-1 do
v:=v+lowerCase(pairs[i])+'='+pairs[i+1]+'; ';
inc(i,2);
end;
-addHeader(v+extra);
+addHeader(UTF8encode(v+extra));
end; // setCookie
procedure ThttpConn.clearRequest();
@@ -1087,13 +1109,13 @@ procedure ThttpConn.processInputBuffer();
request.url:=chop(' ', r);
- s:=uppercase(chopLine(r));
+ s:=ansiUppercase(chopLine(r));
// if 'HTTP/' is not found, chop returns S
if chop('HTTP/',s) = '' then request.ver:=s;
request.headers.text:=r;
- s:=getHeader('Range');
+ s:=getHeaderA('Range');
if ansiStartsText('bytes=',s) then
begin
delete(s,1,6);
@@ -1104,20 +1126,20 @@ procedure ThttpConn.processInputBuffer();
except end;
end;
- s:=getHeader('Authorization');
+ s:=getHeaderA('Authorization');
if AnsiStartsText('Basic',s) then
begin
delete(s,1,6);
- u:=UTF8decode(base64decode(s));
+ u:=UTF8toString(base64decode(s));
request.user:=trim(chop(':',u));
request.pwd:=u;
end;
- s:=getHeader('Connection');
+ s:=getHeaderA('Connection');
persistent:=srv.persistentConnections and
(ansiStartsText('Keep-Alive',s) or (request.ver >= '1.1') and (ipos('close',s)=0));
- s:=getHeader('Content-Type');
+ s:=ansistring(getHeader('Content-Type'));
if ansiStartsText('application/x-www-form-urlencoded', s) then
post.mode:=PM_URLENCODED
else if ansiStartsText('multipart/form-data', s) then
@@ -1214,8 +1236,8 @@ procedure ThttpConn.processInputBuffer();
while l > '' do
begin
c:=chop(nonQuotedPos(';', l), l);
- k:=UTF8decode(trim(chop('=', c)));
- c:=UTF8decode(ansiDequotedStr(c,'"'));
+ k:=UTF8toString(rawByteString(trim(chop('=', c))));
+ c:=UTF8toString(rawByteString(ansiDequotedStr(c,'"')));
if sameText(k, 'filename') then
begin
delete(c, 1, lastDelimiter('/\',c));
@@ -1292,17 +1314,17 @@ procedure ThttpConn.processInputBuffer();
handlePostData();
end; // handleHeaderData
- function replyHeader_OK(contentLength:int64=-1):string;
+ function replyHeader_OK(contentLength:int64=-1):ansistring;
begin
result:=replyheader_code(200)
- +format('Content-Length: %d'+CRLF, [contentLength]);
+ +ansistring(format('Content-Length: %d'+CRLF, [contentLength]));
end; // replyHeader_OK
- function replyHeader_PARTIAL( firstB, lastB, totalB:int64):string;
+ function replyHeader_PARTIAL( firstB, lastB, totalB:int64):ansistring;
begin
result:=replyheader_code(206)
- +format('Content-Range: bytes %d-%d/%d'+CRLF+'Content-Length: %d'+CRLF,
- [firstB, lastB, totalB, lastB-firstB+1 ])
+ +ansistring(format('Content-Range: bytes %d-%d/%d'+CRLF+'Content-Length: %d'+CRLF,
+ [firstB, lastB, totalB, lastB-firstB+1 ]))
end; // replyheader_PARTIAL
begin
@@ -1344,9 +1366,9 @@ case reply.mode of
HRM_DENY: sendHeader( replyheader_mode(reply.mode) );
HRM_UNAUTHORIZED:
sendHeader(replyheader_mode(reply.mode)
- +replyHeader_Str('WWW-Authenticate','Basic realm="'+reply.realm+'"') );
+ +replyHeader_Str('WWW-Authenticate','Basic realm="'+UTF8encode(reply.realm)+'"') );
HRM_REDIRECT, HRM_MOVED:
- sendHeader(replyheader_mode(reply.mode)+'Location: '+reply.url );
+ sendHeader(replyheader_mode(reply.mode)+'Location: '+UTF8encode(reply.url) );
HRM_REPLY, HRM_REPLY_HEADER:
if stream = NIL then
sendHeader( replyHeader_code(404) )
@@ -1364,7 +1386,7 @@ end; // processInputBuffer
procedure ThttpConn.dataavailable(Sender: TObject; Error: Word);
var
- s: string;
+ s: ansistring;
begin
if error <> 0 then exit;
s:=sock.ReceiveStrA();
@@ -1426,9 +1448,9 @@ if (state = HCS_REPLYING_HEADER) and (reply.mode <> HRM_REPLY_HEADER) then
if ((stream = NIL) or (stream.size = 0)) and (reply.mode <> HRM_REPLY) then
begin
reply.bodyMode:=RBM_STRING;
- reply.body:=HRM2BODY[reply.mode];
+ reply.body:=UTF8encode(HRM2BODY[reply.mode]);
if reply.mode in [HRM_REDIRECT, HRM_MOVED] then
- reply.body:=replaceStr(reply.body, '%url%', reply.url);
+ reply.body:=ansistrings.replaceStr(reply.body, '%url%', UTF8encode(reply.url));
initInputStream();
end;
end;
@@ -1491,7 +1513,6 @@ end; // partialBodySize
function ThttpConn.initInputStream():boolean;
var
i: integer;
- buf: ansistring;
begin
result:=FALSE;
FreeAndNil(stream);
@@ -1605,15 +1626,16 @@ end; // replycode2reason
function ThttpConn.replyHeader_code(code:integer):ansistring;
begin
-if reply.reason = '' then reply.reason:=replycode2reason(code);
-result:=format('HTTP/1.1 %d %s'+CRLF, [code,reply.reason])
+if reply.reason = '' then
+ reply.reason:=replycode2reason(code);
+result:=UTF8encode(format('HTTP/1.1 %d %s'+CRLF, [code,reply.reason]))
+ replyHeader_Str('Content-Type',reply.contentType)
end;
function ThttpConn.replyHeader_mode(mode:ThttpReplyMode):ansistring;
begin result:=replyHeader_code(HRM2CODE[mode]) end;
-function getNameOf(s:ansistring):string; // colon included
+function getNameOf(s:ansistring):ansistring; // colon included
begin result:=copy(s, 1, pos(':', s)) end;
// return 0 if not found
@@ -1627,9 +1649,9 @@ result:=from;
end; // namePos
// return true if the operation succeded
-function ThttpConn.setHeaderIfNone(s:string):boolean;
+function ThttpConn.setHeaderIfNone(s:ansistring):boolean;
var
- name: string;
+ name: ansistring;
begin
name:=getNameOf(s);
if name = '' then
diff --git a/main.pas b/main.pas
index 57aed2f..6ef3dcf 100644
--- a/main.pas
+++ b/main.pas
@@ -357,7 +357,7 @@ type
postVars // as $_POST in php
: THashedStringList;
tplCounters: TstringToIntHash;
- workaroundForIEutf8: (toDetect, yes, no);
+ workaroundForIEutf8: (WI_toDetect, WI_yes, WI_no);
{ here we put just a pointer because the file type would triplicate
{ the size of this record, while it is NIL for most connections }
f: ^file; // uploading file handle
@@ -1937,12 +1937,6 @@ while i < srv.conns.count do
result:=length(ips);
end; // countIPs
-function strSHA256(s:string):string;
-begin result:=upperCase( THashSHA2.GetHashString(s) ) end;
-
-function strMD5(s:string):string;
-begin result:=uppercase( THashMD5.GetHashString(s) ) end;
-
function idx_img2ico(i:integer):integer;
begin
if (i < startingImagesCount) or (i >= USER_ICON_MASKS_OFS) then result:=i
@@ -2688,10 +2682,10 @@ else
result:=ICON_FILE;
end; // getIconForTreeview
-function encodeURL(s:string; fullEncode:boolean=FALSE):string;
+function encodeURL(s:string; forceEncodedSpaces:boolean=FALSE):string;
begin
result:=HSlib.encodeURL(s, mainFrm.encodeNonasciiChk.checked,
- fullEncode or mainFrm.encodeSpacesChk.checked)
+ forceEncodedSpaces or mainFrm.encodeSpacesChk.checked)
end; // encodeURL
function protoColon():string;
@@ -3464,7 +3458,6 @@ var
buildTime: Tdatetime;
listing: TfileListing;
diffTpl: Ttpl;
- isDMbrowser: boolean;
hasher: Thasher;
fullEncode, recur, oneAccessible: boolean;
md: TmacroData;
@@ -3632,7 +3625,6 @@ try
if otpl <> filelistTpl then
diffTpl.fullText:=folder.getRecursiveDiffTplAsStr();
- isDMbrowser:= otpl = dmBrowserTpl;
fullEncode:=FALSE;
ofsRelUrl:=length(folder.url(fullEncode))+1;
ofsRelItemUrl:=length(folder.pathTill())+1;
@@ -3920,7 +3912,7 @@ try
else s:=first(data.banReason, data.disconnectReason);
addArray(md.table, ['%reason%', s]);
- data.conn.reply.contentType:=name2mimetype(sectionName, 'text/html');
+ data.conn.reply.contentType:=ansistring(name2mimetype(sectionName, 'text/html'));
if sectionName = 'ban' then data.conn.reply.mode:=HRM_DENY;
if sectionName = 'deny' then data.conn.reply.mode:=HRM_DENY;
if sectionName = 'not found' then data.conn.reply.mode:=HRM_NOT_FOUND;
@@ -3976,9 +3968,9 @@ if result then
conn.reply.mode:=HRM_NOT_MODIFIED;
exit;
end;
-conn.addHeader('ETag: '+etag);
+conn.addHeader('ETag: '+UTF8encode(etag));
if ts > '' then
- conn.addHeader('Last-Modified: '+ts);
+ conn.addHeader('Last-Modified: '+UTF8encode(ts));
end; // notModified
function notModified(conn:ThttpConn; f:string):boolean; overload;
@@ -4194,7 +4186,7 @@ if (logFile.filename > '') and (logFile.apacheFormat = '') then
else s:=s+CRLF+rest;
includeTrailingString(s,CRLF);
- appendFile(getDynLogFilename(cd), s);
+ appendTextFile(getDynLogFilename(cd), s);
end;
if not logOnVideoChk.checked then exit;
@@ -4382,7 +4374,7 @@ try
's': res:=code;
'B': res:=intToStr(cd.conn.bytesSentLastItem);
'b': if cd.conn.bytesSentLastItem = 0 then res:='-' else res:=intToStr(cd.conn.bytesSentLastItem);
- 'i': res:=cd.conn.getHeader(par);
+ 'i': res:=cd.conn.getHeader(ansistring(par));
'm': res:=METHOD2STR[cd.conn.request.method];
'c': if (cd.conn.bytesToSend > 0) and (cd.conn.state = HCS_DISCONNECTED) then res:='X'
else if cd.disconnectAfterReply then res:='-'
@@ -4746,7 +4738,7 @@ var
'\\', '\'
]);
s:=reCB('%(!?[0-9,]+)?(\{([^}]+)\})?>?([a-z])', s, apacheLogCb, data);
- appendFile(getDynLogFilename(data), s+CRLF);
+ appendTextFile(getDynLogFilename(data), s+CRLF);
end; // doLog
function limitsExceededOnConnection():boolean;
@@ -4795,7 +4787,7 @@ var
s:=replaceStr(s,'+',' ');
data.urlvars.text:=s;
for i:=0 to data.urlvars.count-1 do
- data.urlvars[i]:=decodeURL(data.urlvars[i]);
+ data.urlvars[i]:=decodeURL(ansistring(data.urlvars[i]));
end; // extractParams
procedure closeUploadingFile();
@@ -4840,7 +4832,7 @@ var
result:=trim(stripChars(runEventScript(event, table), [TAB,#10,#13]));
// turn illegal chars into underscores
for i:=1 to length(result) do
- if result[i] in ILLEGAL_FILE_CHARS-[':','\'] then
+ if charInSet(result[i], ILLEGAL_FILE_CHARS-[':','\']) then
result[i]:='_';
end; // eventToFilename
@@ -4884,9 +4876,9 @@ var
procedure addContentDisposition(attach:boolean=TRUE);
var s:ansistring;
begin
- s:=HSlib.encodeURL(data.lastFN);
- conn.addHeader( 'Content-Disposition: '+if_(attach, 'attachment; ')
- +'filename*=UTF-8'''''+s+'; filename='+s);
+ s:=ansistring(HSlib.encodeURL(data.lastFN));
+ conn.addHeader( ansistring('Content-Disposition: '+if_(attach, 'attachment; ')
+ +'filename*=UTF-8'''''+s+'; filename='+s));
end;
procedure sessionSetup();
@@ -5124,7 +5116,7 @@ var
end;
if conn.reply.contentType = '' then
- conn.reply.contentType:=if_(trim(getTill('<', s))='', 'text/html', 'text/plain');
+ conn.reply.contentType:=ansistring(if_(trim(getTill('<', s))='', 'text/html', 'text/plain'));
conn.reply.mode:=HRM_REPLY;
conn.reply.bodyMode:=RBM_STRING;
conn.reply.body:=UTF8encode(s);
@@ -5147,11 +5139,9 @@ var
for i:=0 to data.postvars.count-1 do
if sameText('selection', data.postvars.names[i]) then
begin
- asUrl:=decodeURL(getTill('#', data.postvars.valueFromIndex[i])); // omit #anchors
+ asUrl:=getTill('#', data.postvars.valueFromIndex[i]); // omit #anchors
s:=uri2disk(asUrl, f);
- if s = '' then continue;
-
- if not fileOrDirExists(s) then continue; // ignore
+ if (s = '') or not fileOrDirExists(s) then continue; // ignore
runEventScript('file deleting', ['%item-deleting%', s]);
moveToBin(toSA([s, s+'.md5', s+COMMENT_FILE_EXT]) , TRUE);
@@ -5279,7 +5269,7 @@ var
url:=conn.request.url;
extractParams();
- url:=decodeURL(url);
+ url:=decodeURL(ansistring(url));
data.lastFN:=extractFileName( replaceStr(url,'/','\') );
data.agent:=getAgentID(conn);
@@ -5437,7 +5427,8 @@ var
if conn.request.user = '' then
begin // issue a login dialog
getPage('unauthorized', data);
- if loginRealm > '' then conn.reply.realm:=loginRealm;
+ if loginRealm > '' then
+ conn.reply.realm:=loginRealm;
exit;
end
else
@@ -5578,7 +5569,7 @@ var
setupDownloadIcon(data);
data.eta.idx:=0;
- conn.reply.contentType:=name2mimetype(f.name, DEFAULT_MIME);
+ conn.reply.contentType:=ansistring(name2mimetype(f.name, DEFAULT_MIME));
conn.reply.bodyMode:=RBM_FILE;
conn.reply.bodyFile:=f.resource;
data.downloadingWhat:=DW_FILE;
@@ -6409,10 +6400,13 @@ if act then startServer();
end; // changePort
function b64utf8(const s:string):ansistring;
-begin result:=base64encode(UTF8encode(s)); end;
+begin result:=base64encode(UTF8encode(s)) end;
-function decodeB64utf8(const s:ansistring):string;
-begin result:=UTF8decode(base64decode(s)); end;
+function decodeB64utf8(const s:ansistring):string; overload;
+begin result:=UTF8toString(base64decode(s)) end;
+
+function decodeB64utf8(const s:string):string; overload;
+begin result:=decodeB64utf8(ansistring(s)) end;
function zCompressStr(const s: ansistring; level:TCompressionLevel=clMax; type_:TzStreamType=zsZlib): ansistring;
var
@@ -6459,16 +6453,17 @@ type
Tencoding=(E_PLAIN,E_B64,E_ZIP);
function encode(s:string; encoding:Tencoding):string;
+ var
+ a, c: ansistring;
begin
case encoding of
E_PLAIN: result:=s;
E_B64: result:=b64utf8(s);
E_ZIP:
begin
- result:=zCompressStr(s, clMax);
- if length(result) > round(0.9*length(s)) then
- result:=s;
- result:=base64encode(result);
+ a:=UTF8encode(s);
+ c:=zCompressStr(a, clMax);
+ result:=base64encode(if_( length(c) < round(0.8*length(a)), c, a));
end;
end;
end;
@@ -6831,7 +6826,7 @@ var
else if p = 'link' then
a.link:=split(':',t)
else if p = 'notes' then
- a.notes:=UTF8ToString(unzipCfgProp(t))
+ a.notes:=UTF8ToString(unzipCfgProp(ansistring(t)))
end;
end;
end; // strToAccounts
@@ -6857,7 +6852,7 @@ var
while l > '' do
begin
iFrom:=strTointDef(chop(':', l), -1);
- iTo:=str2pic(unzipCfgProp(chop('|', l)));
+ iTo:=str2pic(unzipCfgProp(ansistring(chop('|', l))));
for i:=0 to length(iconMasks)-1 do
if iconMasks[i].int = iFrom then
iconMasks[i].int:=iTo;
@@ -10961,13 +10956,13 @@ s:=cd.conn.reply.body;
if s = '' then exit;
if ipos('gzip', cd.conn.getHeader('Accept-Encoding')) = 0 then exit;
// workaround for IE6 pre-SP2 bug
-if (cd.workaroundForIEutf8 = toDetect) and (cd.agent > '') then
+if (cd.workaroundForIEutf8 = WI_toDetect) and (cd.agent > '') then
if reMatch(cd.agent, '^MSIE [4-6]\.', '!') > 0 then // version 6 and before
- cd.workaroundForIEutf8:=yes
+ cd.workaroundForIEutf8:=WI_yes
else
- cd.workaroundForIEutf8:=no;
+ cd.workaroundForIEutf8:=WI_no;
s:=ZcompressStr(s, clFastest, zsGzip);
-if (cd.workaroundForIEutf8 = yes) and (length(s) < BAD_IE_THRESHOLD) then exit;
+if (cd.workaroundForIEutf8 = WI_yes) and (length(s) < BAD_IE_THRESHOLD) then exit;
cd.conn.addHeader('Content-Encoding: gzip');
//cd.conn.addHeader('Content-Length: '+intToStr(length(s)));
cd.conn.reply.body:=s;
@@ -12205,7 +12200,7 @@ if ipos('', dyndns.lastResult) = 0 then
msgDlg(dyndns.lastResult);
exit;
end;
-fn:=saveTempFile(UTF8encode(dyndns.lastResult));
+fn:=saveTempFile(dyndns.lastResult);
if fn = '' then
begin
msgDlg(MSG_NO_TEMP, MB_ICONERROR);
@@ -12240,7 +12235,7 @@ while current > '' do
if defV = v then continue;
if k = 'dynamic-dns-updater' then
begin // remove login data
- v:=decodeB64utf8(v);
+ v:=decodeB64utf8(ansistring(v));
chop('//',v);
v:=chop('/',v);
if ansiContainsStr(v, '@') then chop('@',v);
diff --git a/optionsDlg.pas b/optionsDlg.pas
index 81d1f3e..f99ded7 100644
--- a/optionsDlg.pas
+++ b/optionsDlg.pas
@@ -759,7 +759,7 @@ begin
if renamingAccount then
exit;
key:=upcase(key);
-if key in ['0'..'9','A'..'Z'] then
+if charInSet(key, ['0'..'9','A'..'Z']) then
begin
s:=accountsBox.ItemIndex;
n:=length(tempAccounts);
diff --git a/scriptLib.pas b/scriptLib.pas
index 7f9036e..99b6bcc 100644
--- a/scriptLib.pas
+++ b/scriptLib.pas
@@ -48,7 +48,7 @@ procedure resetLog();
implementation
uses windows, utilLib, trayLib, parserLib, graphics, classes, sysutils, StrUtils,
- hslib, comctrls, math, controls, forms, clipbrd, MMsystem, OverbyteicsMD5, OverbyteIcsSha1;
+ hslib, comctrls, math, controls, forms, clipbrd, MMsystem;
const
HEADER = '