mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: FTP - send password in server encoding

Browse source
This commit is contained in:
Alexander Koblov 2019-10-21 17:40:32 +00:00
commit b1af4e2490
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/wfx/ftp/src/ftp.lpi
View file

@ -21,8 +21,8 @@
<VersionInfo>
<UseVersionInfo Value="True"/>
<MinorVersionNr Value="3"/>
<RevisionNr Value="2"/>
<StringTable FileDescription="FTP WFX plugin for Double Commander" LegalCopyright="Copyright (C) 2006-2017 Alexander Koblov"/>
<RevisionNr Value="3"/>
<StringTable FileDescription="FTP WFX plugin for Double Commander" LegalCopyright="Copyright (C) 2006-2019 Alexander Koblov"/>
</VersionInfo>
<BuildModes Count="2">
<Item1 Name="Release" Default="True"/>

8
plugins/wfx/ftp/src/ftpadv.pas
View file

@ -106,8 +106,9 @@ type
procedure DoStatus(Response: Boolean; const Value: string); override;
procedure OnSocketStatus(Sender: TObject; Reason: THookSocketReason; const Value: String);
public
function ClientToServer(const Value: UnicodeString): AnsiString;
function ServerToClient(const Value: AnsiString): UnicodeString;
function ClientToServer(const Value: AnsiString): AnsiString; overload;
function ClientToServer(const Value: UnicodeString): AnsiString; overload;
public
function FsFindFirstW(const Path: String; var FindData: TWin32FindDataW): Pointer; virtual;
function FsFindNextW(Handle: Pointer; var FindData: TWin32FindDataW): BOOL; virtual;
@ -558,6 +559,11 @@ begin
LogProc(PluginNumber, msgtype_importanterror, PWideChar(ServerToClient(Value)));
end;
function TFTPSendEx.ClientToServer(const Value: AnsiString): AnsiString;
begin
Result:= ConvertFromUtf8(Value);
end;
function TFTPSendEx.ClientToServer(const Value: UnicodeString): AnsiString;
begin
Result:= ConvertFromUtf8(UTF16ToUTF8(Value));

2
plugins/wfx/ftp/src/ftpfunc.pas
View file

@ -369,7 +369,7 @@ begin
Exit;
end;
end;
FtpSend.Password := Connection.Password;
FtpSend.Password := FtpSend.ClientToServer(Connection.Password);
SetProxy(FtpSend, Connection.Proxy);
// try to connect
if FtpLogin(Connection, FtpSend) then