changed: export plugin:

password is stored as a string (in database)


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@814 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2012-03-01 15:39:13 +00:00
parent 3e3546a2fd
commit e61f0db57e
3 changed files with 10 additions and 10 deletions

View File

@ -49,13 +49,13 @@ void EDb::SetExportValues(PGresult * r, int row, Export & exp)
exp.ftp_id = AssertValueLong(r, row, cftp_id);
exp.ftp_pass_type = AssertValueInt(r, row, cpass_type);
AssertValueWide(r, row, cdir, exp.dir);
AssertValueWide(r, row, cftp_dir, exp.ftp_dir);
AssertValueWide(r, row, cname, exp.ftp_name);
AssertValueWide(r, row, cserver, exp.ftp_server);
AssertValueWide(r, row, clogin, exp.ftp_login);
AssertValueWide(r, row, chttp_server, exp.http_server);
AssertValueBin(r, row, cpass, exp.ftp_pass_bin);
AssertValueWide(r, row, cdir, exp.dir);
AssertValueWide(r, row, cftp_dir, exp.ftp_dir);
AssertValueWide(r, row, cname, exp.ftp_name);
AssertValueWide(r, row, cserver, exp.ftp_server);
AssertValueWide(r, row, clogin, exp.ftp_login);
AssertValueWide(r, row, chttp_server, exp.http_server);
AssertValueWide(r, row, cpass, exp.ftp_pass);
exp.can_change_ftp_params = AssertValueBool(r, row, ccan_change_ftp_params);
exp.can_change_dir = AssertValueBool(r, row, ccan_change_dir);

View File

@ -38,7 +38,6 @@ struct Export
std::wstring ftp_server;
std::wstring ftp_login;
std::wstring ftp_pass;
std::string ftp_pass_bin;
int ftp_pass_type;
bool can_change_ftp_params;
@ -64,7 +63,6 @@ struct Export
ftp_server.clear();
ftp_login.clear();
ftp_pass.clear();
ftp_pass_bin.clear();
can_change_ftp_params = false;
can_change_dir = false;

View File

@ -85,10 +85,11 @@ bool ExportInfo::DecodePass(Export & exp)
{
if( exp.ftp_pass_type == 0 )
{
PT::UTF8ToWide(exp.ftp_pass_bin, exp.ftp_pass);
}
else
{
/*
if( system->crypt.RSA(false, rsa_key, exp.ftp_pass_bin, pass_decrypted) )
{
PT::UTF8ToWide(pass_decrypted, exp.ftp_pass);
@ -99,6 +100,7 @@ bool ExportInfo::DecodePass(Export & exp)
log << log1 << "Export: I cannot decrypt a password (RSA failed)" << logend;
return false;
}
*/
}
return true;