diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index a5d059959..5717d69f6 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -444,13 +444,7 @@ void TInstaller_mask::update_version() bool TInstaller_mask::check_customer() const { Tdninst dninst; - bool good = dninst.find_serno(); - if (good) - { - TString msg; - good = dninst.test_cmdline("MustCall", false, msg) == 0; - } - return good; + return dninst.check_customer() == 0; } @@ -609,7 +603,7 @@ bool TInstaller_mask::autoload() str = ininame; } else - modules.destroy(i); + modules.destroy(i); } modules.pack(); } diff --git a/ba/ba2800.cpp b/ba/ba2800.cpp index f1092484d..24b03b9c2 100644 --- a/ba/ba2800.cpp +++ b/ba/ba2800.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -568,7 +569,26 @@ bool Tdnist_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) if (ftp != DNINST_ZIP && ftp.starts_with("ftp://") && yesno_box(FR("Copiare il DNINST locale in %s?"), (const char*)ftp)) { - if (!xvt_fsys_fcopy(DNINST_ZIP, ftp)) + int at = ftp.find('@', 6); if (at < 0) at = 5; + int slash = ftp.find('/', at+1); + const TString& server = ftp.sub(at+1, slash); + + bool sent = false; + TSocketClient aga; + CONNID id = aga.QueryConnection("21", server); + if (id > 0) + { + TString16 user = "guastalla", password = "tk0nmo4q3"; + const int colon = ftp.find(':', 6); + if (colon > 6 && colon < at) + { + user = ftp.sub(6, colon); + password = ftp.sub(colon+1, at); + } + sent = aga.FtpSendFile(id, ftp.mid(slash), DNINST_ZIP, user, password); + aga.RemoveConnection(id); + } + if (!sent) cantwrite_box(ftp); } } diff --git a/ba/bamenu.men b/ba/bamenu.men index e68f2e334..a06864c43 100755 --- a/ba/bamenu.men +++ b/ba/bamenu.men @@ -127,6 +127,7 @@ Item_01 = "Riattribuzione codice allegato", "bacnv 21", "" Item_02 = "Aggiornamento IV direttiva CEE", "bacnv 22", "" Item_03 = "Aggiornamento profili documento personalizzati", "bacnv 23", "" Item_04 = "Riattribuzione campi CONAI", "bacnv 24", "" +Item_05 = "Gestione attivazioni", "ba2 -7", "" [MENU_PREFERITI] Caption = "Preferiti"